From 5cfea96b23b268bc93c6ffa5888c773031da7d67 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 20 Apr 2012 15:36:29 +0100 Subject: [PATCH] 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 Reviewed-by: Derrick Brashear --- tests/common/common.h | 2 +- tests/common/servers.c | 2 +- tests/volser/vos-t.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/common/common.h b/tests/common/common.h index fcc4113..7476840 100644 --- 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 18b9402..a322e23 100644 --- 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 a247e0e..eb58547 100644 --- 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; -- 1.9.4