tests: Make afstest_StopVLServer generic

The StopVLServer function can be used to stop any server for which
we know the pid. So, rename it as afstest_StopServer to make this
apparent.

Change-Id: Ia5973342e81dc15a698e84e69b314cd6157831f7
Reviewed-on: http://gerrit.openafs.org/7258
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/tests/common/common.h b/tests/common/common.h
index fcc41133f03f8dcbb6140ea432a6b5c9c73976a3..747684039abeb02bb99b843927d04e77fb06a250 100644 (file)
--- a/tests/common/common.h
+++ b/tests/common/common.h
@@ -32,7 +32,7 @@ extern int afstest_AddDESKeyFile(struct afsconf_dir *dir);
 /* servers.c */
 
 extern int afstest_StartVLServer(char *dirname, pid_t *serverPid);
-extern int afstest_StopVLServer(pid_t serverPid);
+extern int afstest_StopServer(pid_t serverPid);
 
 /* ubik.c */
 struct ubik_client;

diff --git a/tests/common/servers.c b/tests/common/servers.c
index 18b94028f8304c7b6c7324dcb94da491954a5d64..a322e234038c1ec60dd796d5654f7864d96aec0b 100644 (file)
--- a/tests/common/servers.c
+++ b/tests/common/servers.c
@@ -45,7 +45,7 @@ afstest_StartVLServer(char *dirname, pid_t *serverPid)
 }
 
 int
-afstest_StopVLServer(pid_t serverPid)
+afstest_StopServer(pid_t serverPid)
 {
     int status;
 

diff --git a/tests/volser/vos-t.c b/tests/volser/vos-t.c
index a247e0e61cbe34cca884424a5c37d460ae866f21..eb585476977d98a91b3311b42f8305cafc205fa8 100644 (file)
--- a/tests/volser/vos-t.c
+++ b/tests/volser/vos-t.c
@@ -125,7 +125,7 @@ main(int argc, char **argv)
 
     TestListAddrs(ubikClient, dirname);
 
-    code = afstest_StopVLServer(serverPid);
+    code = afstest_StopServer(serverPid);
     is_int(0, code, "Server exited cleanly");
 
     return 0;