Merge pull request #1276 from chu11/issue1259

kvs: cleanup / re-organize sharness tests

t/Makefile.am

@@ -49,12 +49,14 @@ TESTS = \
 	t0016-cron-faketime.t \
 	t0017-security.t \
 	t1000-kvs.t \
-	t1001-barrier-basic.t \
-	t1002-kvs-extra.t \
-	t1005-cmddriver.t \
-	t1006-apidisconnect.t \
-	t1007-kz.t \
-	t1008-proxy.t \
+	t1001-kvs-internals.t \
+	t1002-kvs-watch.t \
+	t1003-kvs-stress.t \
+	t1101-barrier-basic.t \
+	t1102-cmddriver.t \
+	t1103-apidisconnect.t \
+	t1104-kz.t \
+	t1105-proxy.t \
 	t2000-wreck.t \
 	t2001-jsc.t \
 	t2002-pmi.t \
@@ -120,12 +122,14 @@ check_SCRIPTS = \
 	t0016-cron-faketime.t \
 	t0017-security.t \
 	t1000-kvs.t \
-	t1001-barrier-basic.t \
-	t1002-kvs-extra.t \
-	t1005-cmddriver.t \
-	t1006-apidisconnect.t \
-	t1007-kz.t \
-	t1008-proxy.t \
+	t1001-kvs-internals.t \
+	t1002-kvs-watch.t \
+	t1003-kvs-stress.t \
+	t1101-barrier-basic.t \
+	t1102-cmddriver.t \
+	t1103-apidisconnect.t \
+	t1104-kz.t \
+	t1105-proxy.t \
 	t2000-wreck.t \
 	t2001-jsc.t \
 	t2002-pmi.t \
@@ -171,14 +175,12 @@ check_PROGRAMS = \
 	kz/kzutil \
 	kvs/torture \
 	kvs/dtree \
-	kvs/getas \
 	kvs/blobref \
 	kvs/hashtest \
 	kvs/watch \
 	kvs/watch_disconnect \
 	kvs/commit \
 	kvs/commitmerge \
-	kvs/basic \
 	module/basic \
 	request/treq \
 	barrier/tbarrier
@@ -280,11 +282,6 @@ kvs_dtree_CPPFLAGS = $(test_cppflags)
 kvs_dtree_LDADD = \
 	$(test_ldadd) $(LIBDL) $(LIBUTIL)
 
-kvs_getas_SOURCES = kvs/getas.c
-kvs_getas_CPPFLAGS = $(test_cppflags)
-kvs_getas_LDADD = \
-	$(test_ldadd) $(LIBDL) $(LIBUTIL)
-
 kvs_blobref_SOURCES = kvs/blobref.c
 kvs_blobref_CPPFLAGS = $(test_cppflags)
 kvs_blobref_LDADD = \
@@ -315,11 +312,6 @@ kvs_hashtest_CPPFLAGS = $(test_cppflags) $(SQLITE_CFLAGS)
 kvs_hashtest_LDADD = \
 	$(test_ldadd) $(LIBDL) $(LIBUTIL) $(LIBJUDY) $(SQLITE_LIBS)
 
-kvs_basic_SOURCES = kvs/basic.c
-kvs_basic_CPPFLAGS = $(test_cppflags)
-kvs_basic_LDADD = \
-	$(test_ldadd) $(LIBDL) $(LIBUTIL)
-
 request_treq_SOURCES = request/treq.c
 request_treq_CPPFLAGS = $(test_cppflags)
 request_treq_LDADD = \