diff --git a/newbrt/tests/recovery-cbegin-cend-hello.c b/newbrt/tests/recovery-cbegin-cend-hello.c index bc6b846db00..e422d5c52c2 100644 --- a/newbrt/tests/recovery-cbegin-cend-hello.c +++ b/newbrt/tests/recovery-cbegin-cend-hello.c @@ -33,6 +33,12 @@ run_test(void) { r = toku_logger_close(&logger); assert(r == 0); } + // redirect stderr + int devnul = open("/dev/null", O_WRONLY); + assert(devnul>=0); + r = dup2(devnul, fileno(stderr)); assert(r==fileno(stderr)); + r = close(devnul); assert(r==0); + // run recovery r = tokudb_recover(TESTDIR, TESTDIR, 0, 0, 0); assert(r == 0); diff --git a/newbrt/tests/recovery-cbegin.c b/newbrt/tests/recovery-cbegin.c index bf7de6c11f9..ed96d73ae51 100644 --- a/newbrt/tests/recovery-cbegin.c +++ b/newbrt/tests/recovery-cbegin.c @@ -22,8 +22,12 @@ run_test(void) { r = toku_logger_close(&logger); assert(r == 0); // run recovery + int devnul = open("/dev/null", O_WRONLY); + assert(devnul>=0); + r = dup2(devnul, fileno(stderr)); assert(r==fileno(stderr)); + r = close(devnul); assert(r==0); + r = tokudb_recover(TESTDIR, TESTDIR, 0, 0, 0); - printf("%s:%d %d\n", __FUNCTION__, __LINE__, r); assert(r == 0); return 0; } diff --git a/newbrt/tests/recovery-fopen-missing-file.c b/newbrt/tests/recovery-fopen-missing-file.c index 39300b15929..233e5d7d730 100644 --- a/newbrt/tests/recovery-fopen-missing-file.c +++ b/newbrt/tests/recovery-fopen-missing-file.c @@ -27,6 +27,12 @@ run_test(void) { r = toku_log_fopen(logger, NULL, TRUE, iname, filenum, treeflags); r = toku_logger_close(&logger); assert(r == 0); + // redirect stderr + int devnul = open("/dev/null", O_WRONLY); + assert(devnul>=0); + r = dup2(devnul, fileno(stderr)); assert(r==fileno(stderr)); + r = close(devnul); assert(r==0); + // run recovery r = tokudb_recover(TESTDIR, TESTDIR, 0, 0, 0); assert(r == 0); diff --git a/newbrt/tests/recovery-hello.c b/newbrt/tests/recovery-hello.c index 5cd6fedafea..a62d2f18454 100644 --- a/newbrt/tests/recovery-hello.c +++ b/newbrt/tests/recovery-hello.c @@ -27,6 +27,12 @@ run_test(void) { r = toku_log_comment(logger, NULL, TRUE, 0, there); assert(r == 0); r = toku_logger_close(&logger); assert(r == 0); + // redirect stderr + int devnul = open("/dev/null", O_WRONLY); + assert(devnul>=0); + r = dup2(devnul, fileno(stderr)); assert(r==fileno(stderr)); + r = close(devnul); assert(r==0); + // run recovery r = tokudb_recover(TESTDIR, TESTDIR, 0, 0, 0); assert(r == 0); diff --git a/newbrt/tests/recovery-no-datadir.c b/newbrt/tests/recovery-no-datadir.c index 4871d95bf54..2689976a099 100644 --- a/newbrt/tests/recovery-no-datadir.c +++ b/newbrt/tests/recovery-no-datadir.c @@ -21,6 +21,12 @@ run_test(void) { r = toku_log_comment(logger, NULL, TRUE, 0, hello); r = toku_logger_close(&logger); assert(r == 0); + // redirect stderr + int devnul = open("/dev/null", O_WRONLY); + assert(devnul>=0); + r = dup2(devnul, fileno(stderr)); assert(r==fileno(stderr)); + r = close(devnul); assert(r==0); + // run recovery r = tokudb_recover("/junk", TESTDIR, 0, 0, 0); assert(r != 0); diff --git a/newbrt/tests/recovery-no-log.c b/newbrt/tests/recovery-no-log.c index a3b22b6b4c2..6794c77b17c 100644 --- a/newbrt/tests/recovery-no-log.c +++ b/newbrt/tests/recovery-no-log.c @@ -13,6 +13,12 @@ run_test(void) { system("rm -rf " TESTDIR); r = toku_os_mkdir(TESTDIR, S_IRWXU); assert(r == 0); + // redirect stderr + int devnul = open("/dev/null", O_WRONLY); + assert(devnul>=0); + r = dup2(devnul, fileno(stderr)); assert(r==fileno(stderr)); + r = close(devnul); assert(r==0); + // run recovery r = tokudb_recover(TESTDIR, TESTDIR, 0, 0, 0); assert(r != 0);