Instead of bzipping it, move the data dirs out to source:tokudb/tokudb.data/. Refs #3037. [t:3037]

git-svn-id: file:///svn/toku/tokudb@25548 c7de825b-a66e-492c-adef-691d508d4ae1

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)

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";
 
 
 

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) {

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) {

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};