diff --git a/src/tests/Makefile b/src/tests/Makefile index 1fd4255ac3156c8e499c77edf1788e45838ebe24..b1bd0421c305b1ca9f05575c6efa0c37c3b1f659 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -739,14 +739,8 @@ LOADER_USE_DEFAULT_TESTS = create-abort create-close no-puts reference-test stre loader-tests: $(LOADER_TESTS) echo $(LOADER_TESTS) -UNPACKED_DIRS = env_preload.4.1.1.cleanshutdown env_preload.4.1.1.flat.cleanshutdown env_preload.4.1.1.node4k.cleanshutdown -%.cleanshutdown: %.cleanshutdown.tar.bz2 - bzcat $< | tar xf - -upgrade-test-1.tdbrun: $(UNPACKED_DIRS) - clean: rm -f $(ALL_BINS) rm -rf dir.* *.check.output *.check.valgrind rm -f dump.bdb.1426 dump.tdb.1426 test1426.bdb rm -f *.bdb *.tdb - rm -rf $(UNPACKED_DIRS) diff --git a/src/tests/upgrade-test-1.c b/src/tests/upgrade-test-1.c index 7e765c5cd1e37e2a89b72ab6a37e7bc9a8bf9705..1fc1d6db2e73b6bbd2a7219a81568d261f13d8dd 100644 --- a/src/tests/upgrade-test-1.c +++ b/src/tests/upgrade-test-1.c @@ -24,11 +24,13 @@ int SRC_VERSION = 4; int littlenode = 0; int flat = 0; +#define OLDDATADIR "ls ../../../../tokudb.data/" + char *env_dir = ENVDIR; // the default env_dir. char *db_v5_dir = "dir.preload-db.c.tdb"; -char *db_v4_dir = "env_preload.4.1.1.cleanshutdown"; -char *db_v4_dir_node4k = "env_preload.4.1.1.node4k.cleanshutdown"; -char *db_v4_dir_flat = "env_preload.4.1.1.flat.cleanshutdown"; +char *db_v4_dir = OLDDATADIR "env_preload.4.1.1.cleanshutdown"; +char *db_v4_dir_node4k = OLDDATADIR "env_preload.4.1.1.node4k.cleanshutdown"; +char *db_v4_dir_flat = OLDDATADIR "env_preload.4.1.1.flat.cleanshutdown"; diff --git a/src/tests/upgrade-test-2.c b/src/tests/upgrade-test-2.c index e61ce2a6149ee90f358c34bb34d5b7fe0dfb8a85..89f0703a4868cd427ae5b8948c8e8b4dabe3cb1a 100644 --- a/src/tests/upgrade-test-2.c +++ b/src/tests/upgrade-test-2.c @@ -22,11 +22,12 @@ int CHECK_RESULTS=0; int SRC_VERSION = 4; int littlenode = 0; +#define OLDDATADIR "ls ../../../../tokudb.data/" char *env_dir = ENVDIR; // the default env_dir. char *db_v5_dir = "dir.preload-db.c.tdb"; -char *db_v4_dir = "env_preload.4.1.1.cleanshutdown"; -char *db_v4_dir_node4k = "env_preload.4.1.1.node4k.cleanshutdown"; +char *db_v4_dir = OLDDATADIR "env_preload.4.1.1.cleanshutdown"; +char *db_v4_dir_node4k = OLDDATADIR "env_preload.4.1.1.node4k.cleanshutdown"; static void upgrade_test_2(DB **dbs) { diff --git a/src/tests/upgrade-test-3.c b/src/tests/upgrade-test-3.c index 59f74b6fafe14a89cd87b241b62118182c1eb88e..c91ea17beabd7c4fcc9e83cafd4247cc5f62fabf 100644 --- a/src/tests/upgrade-test-3.c +++ b/src/tests/upgrade-test-3.c @@ -22,11 +22,12 @@ int CHECK_RESULTS=0; int SRC_VERSION = 4; int littlenode = 0; +#define OLDDATADIR "ls ../../../../tokudb.data/" char *env_dir = ENVDIR; // the default env_dir. char *db_v5_dir = "dir.preload-db.c.tdb"; -char *db_v4_dir = "env_preload.4.1.1.cleanshutdown"; -char *db_v4_dir_node4k = "env_preload.4.1.1.node4k.cleanshutdown"; +char *db_v4_dir = OLDDATADIR "env_preload.4.1.1.cleanshutdown"; +char *db_v4_dir_node4k = OLDDATADIR "env_preload.4.1.1.node4k.cleanshutdown"; static void upgrade_test_3(DB **dbs) { diff --git a/src/tests/upgrade-test-4.c b/src/tests/upgrade-test-4.c index 4b373a65bbfd0559a99f079b9cb00e23ee742d2f..7cf90e2656c48f4f5b06a7d284900d35e931da9a 100644 --- a/src/tests/upgrade-test-4.c +++ b/src/tests/upgrade-test-4.c @@ -22,11 +22,12 @@ int CHECK_RESULTS=0; int SRC_VERSION = 4; int littlenode = 0; +#define OLDDATADIR "ls ../../../../tokudb.data/" char *env_dir = ENVDIR; // the default env_dir. char *db_v5_dir = "dir.preload-db.c.tdb"; -char *db_v4_dir = "env_preload.4.1.1.cleanshutdown"; -char *db_v4_dir_node4k = "env_preload.4.1.1.node4k.cleanshutdown"; +char *db_v4_dir = OLDDATADIR "env_preload.4.1.1.cleanshutdown"; +char *db_v4_dir_node4k = OLDDATADIR "env_preload.4.1.1.node4k.cleanshutdown"; enum {ROWS_PER_TRANSACTION=10000};