From f13ae914aad2dffb0a28d911002a8d3fe132ddb8 Mon Sep 17 00:00:00 2001 From: Shane Snyder Date: Wed, 1 Nov 2017 21:08:24 -0500 Subject: [PATCH] more cleanup --- tests/Makefile.subdir | 7 ++----- tests/mobject-server.c | 10 ---------- ...st-sds-keyval-client.c => sds-keyval-client-test.c} | 0 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 tests/mobject-server.c rename tests/{test-sds-keyval-client.c => sds-keyval-client-test.c} (100%) diff --git a/tests/Makefile.subdir b/tests/Makefile.subdir index ec03d25..4a0c68e 100644 --- a/tests/Makefile.subdir +++ b/tests/Makefile.subdir @@ -4,8 +4,7 @@ TESTS_ENVIRONMENT += \ check_PROGRAMS += \ tests/mobject-connect-test \ - tests/mobject-server \ - tests/test-sds-keyval-client \ + tests/sds-keyval-client-test \ tests/mobject-client-test # don't include rados programs in make check @@ -26,7 +25,5 @@ endif tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS} -tests_mobject_server_LDADD = src/server/libmobject-server.la ${SERVER_LIBS} - -tests_test_sds_keyval_client_LDADD = ${CLIENT_LIBS} +tests_sds_keyval_client_test_LDADD = ${CLIENT_LIBS} diff --git a/tests/mobject-server.c b/tests/mobject-server.c deleted file mode 100644 index c6a48df..0000000 --- a/tests/mobject-server.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include -/* the SDS-keyval and bake-bulk tests should still work, even if there is a higher-level protocol */ -int main(int argc, char **argv) -{ - margo_instance_id mid; - mid = margo_init(argv[1], MARGO_SERVER_MODE, 0, -1); - mobject_server_init(mid, argv[2]); - margo_wait_for_finalize(mid); -} diff --git a/tests/test-sds-keyval-client.c b/tests/sds-keyval-client-test.c similarity index 100% rename from tests/test-sds-keyval-client.c rename to tests/sds-keyval-client-test.c -- 2.26.2