tests: Move test data into its own 'test/data' subdirectory

Author: libbitc

configure.ac

@@ -163,6 +163,7 @@ AC_CONFIG_FILES([
 	lib/Makefile
 	src/Makefile
 	test/Makefile
+	test/data/Makefile
 	external/Makefile
 	])
 AC_OUTPUT

test/Makefile.am

@@ -4,21 +4,12 @@ if ENABLE_VALGRIND
                         --error-exitcode=1
 endif
 
+SUBDIRS		= data
+
 AM_CPPFLAGS	= -DTEST_SRCDIR=\"$(top_srcdir)/test\" \
 		  -I$(top_srcdir)/include \
 		  -I$(top_srcdir)/external/secp256k1/include
 
-EXTRA_DIST	= \
-	base58_encode_decode.json	\
-	base58_keys_invalid.json base58_keys_valid.json	\
-	random.data			\
-	blk0.json  blk120383.json  tx3e0dc3da.json \
-	blk0.ser  blk120383.ser  tx3e0dc3da.ser \
-	blks10.ser \
-	hdr193000.ser tn_hdr35141.ser \
-	tn_blk35133.ser wallet-basics.json sighash.json \
-	script_tests.json tx_valid.json tx_invalid.json
-
 noinst_LIBRARIES= libtest.a
 
 libtest_a_SOURCES= libtest.h libtest.c chisq.c randtest.c

test/base58.c

@@ -344,9 +344,9 @@ static void runtest_keys_invalid(const char *json_base_fn)
 
 int main (int argc, char *argv[])
 {
-	runtest_encdec("base58_encode_decode.json");
-	runtest_keys_valid("base58_keys_valid.json");
-	runtest_keys_invalid("base58_keys_invalid.json");
+	runtest_encdec("data/base58_encode_decode.json");
+	runtest_keys_valid("data/base58_keys_valid.json");
+	runtest_keys_invalid("data/base58_keys_invalid.json");
 
 	bp_key_static_shutdown();
 	return 0;

test/blkdb.c

@@ -97,9 +97,9 @@ static void runtest(const char *ser_base_fn, const struct chain_info *chain,
 
 int main (int argc, char *argv[])
 {
-	runtest("hdr193000.ser", &chain_metadata[CHAIN_BITCOIN], 193000,
+	runtest("data/hdr193000.ser", &chain_metadata[CHAIN_BITCOIN], 193000,
 	    "000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317");
-	runtest("tn_hdr35141.ser", &chain_metadata[CHAIN_TESTNET3], 35141,
+	runtest("data/tn_hdr35141.ser", &chain_metadata[CHAIN_TESTNET3], 35141,
 	    "0000000000dde6ce4b9ad1e2a5be59f1b7ace6ef8d077d846263b0bfbc984f7f");
 
 	bp_key_static_shutdown();

test/block.c

@@ -86,8 +86,8 @@ static void runtest(const char *json_fn_base, const char *ser_fn_base)
 
 int main (int argc, char *argv[])
 {
-	runtest("blk0.json", "blk0.ser");
-	runtest("blk120383.json", "blk120383.ser");
+	runtest("data/blk0.json", "data/blk0.ser");
+	runtest("data/blk120383.json", "data/blk120383.ser");
 
 	bp_key_static_shutdown();
 	return 0;

test/blockfile.c

@@ -58,7 +58,7 @@ static void runtest(const char *ser_fn_base)
 
 int main (int argc, char *argv[])
 {
-	runtest("blks10.ser");
+	runtest("data/blks10.ser");
 
 	bp_key_static_shutdown();
 	return 0;

test/data/Makefile.am

@@ -0,0 +1,11 @@
+
+EXTRA_DIST = \
+	base58_encode_decode.json	\
+	base58_keys_invalid.json base58_keys_valid.json		\
+	blk0.json blk0.ser blks10.ser \
+	blk120383.json blk120383.ser \
+	hdr193000.ser tn_hdr35141.ser \
+	random.data script_tests.json sighash.json \
+	tn_blk35133.ser tx3e0dc3da.json tx3e0dc3da.ser \
+	tx_invalid.json tx_valid.json \
+	wallet-basics.json