Commit 315386fa authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

refs #5949 fix le-cursor-*


git-svn-id: file:///svn/toku/tokudb@52767 c7de825b-a66e-492c-adef-691d508d4ae1
parent 8ba95208
...@@ -202,11 +202,7 @@ static void ...@@ -202,11 +202,7 @@ static void
init_logdir(const char *logdir) { init_logdir(const char *logdir) {
int error; int error;
char cmd[32+strlen(logdir)]; toku_os_recursive_delete(logdir);
sprintf(cmd, "rm -rf %s", logdir);
error = system(cmd);
assert(error == 0);
error = toku_os_mkdir(logdir, 0777); error = toku_os_mkdir(logdir, 0777);
assert(error == 0); assert(error == 0);
} }
...@@ -225,10 +221,8 @@ test_main (int argc , const char *argv[]) { ...@@ -225,10 +221,8 @@ test_main (int argc , const char *argv[]) {
assert(error == 0); assert(error == 0);
const int n = 10; const int n = 10;
char ftfile[TOKU_PATH_MAX+1]; create_populate_tree(".", "ftfile", n);
toku_path_join(logdir, 2, TOKU_TEST_FILENAME, "ftfile"); test_provdel(".", "ftfile", n);
create_populate_tree(".", ftfile, n);
test_provdel(".", ftfile, n);
return 0; return 0;
} }
...@@ -269,11 +269,7 @@ static void ...@@ -269,11 +269,7 @@ static void
init_logdir(const char *logdir) { init_logdir(const char *logdir) {
int error; int error;
char cmd[32+strlen(logdir)]; toku_os_recursive_delete(logdir);
sprintf(cmd, "rm -rf %s", logdir);
error = system(cmd);
assert(error == 0);
error = toku_os_mkdir(logdir, 0777); error = toku_os_mkdir(logdir, 0777);
assert(error == 0); assert(error == 0);
} }
...@@ -292,12 +288,10 @@ test_main (int argc , const char *argv[]) { ...@@ -292,12 +288,10 @@ test_main (int argc , const char *argv[]) {
assert(error == 0); assert(error == 0);
const int n = 10; const int n = 10;
char ftfile[TOKU_PATH_MAX+1]; create_populate_tree(".", "ftfile", n);
toku_path_join(logdir, 2, TOKU_TEST_FILENAME, "ftfile"); test_neg_infinity("ftfile", n);
create_populate_tree(".", ftfile, n); test_pos_infinity("ftfile", n);
test_neg_infinity(ftfile, n); test_between("ftfile", n);
test_pos_infinity(ftfile, n);
test_between(ftfile, n);
return 0; return 0;
} }
...@@ -183,11 +183,9 @@ test_main (int argc , const char *argv[]) { ...@@ -183,11 +183,9 @@ test_main (int argc , const char *argv[]) {
char logdir[TOKU_PATH_MAX+1]; char logdir[TOKU_PATH_MAX+1];
toku_path_join(logdir, 2, TOKU_TEST_FILENAME, "logdir"); toku_path_join(logdir, 2, TOKU_TEST_FILENAME, "logdir");
char ftfile[TOKU_PATH_MAX+1];
toku_path_join(logdir, 2, TOKU_TEST_FILENAME, "ftfile");
run_test(logdir, ftfile, 0); run_test(logdir, "ftfile", 0);
run_test(logdir, ftfile, 1000); run_test(logdir, "ftfile", 1000);
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment