diff options
| author | Vamsi Krishna <vamsi.krishna@mongodb.com> | 2017-07-24 15:23:19 +1000 |
|---|---|---|
| committer | Vamsi Krishna <vamsi.krishna@mongodb.com> | 2017-07-24 15:23:19 +1000 |
| commit | 03adada5f2d74c19439e606868de308dba183a54 (patch) | |
| tree | b8fbe44247c6ea9485870f65ef560a01972d0c61 | |
| parent | e8afecc7b27a2e93f3e075a7d1881b1a0cf04f84 (diff) | |
| download | mongo-03adada5f2d74c19439e606868de308dba183a54.tar.gz | |
Revert "WT-3446 Temporarily disable checkpoint timestamp testing."
This reverts commit e8afecc7b27a2e93f3e075a7d1881b1a0cf04f84.
| -rwxr-xr-x | test/checkpoint/smoke.sh | 13 | ||||
| -rw-r--r-- | test/checkpoint/test_checkpoint.c | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/test/checkpoint/smoke.sh b/test/checkpoint/smoke.sh index 699062492dd..3cf0b62094f 100755 --- a/test/checkpoint/smoke.sh +++ b/test/checkpoint/smoke.sh @@ -7,9 +7,8 @@ echo "checkpoint: 3 mixed tables" $TEST_WRAPPER ./t -T 3 -t m # Smoke-test timestamps -# timestamp testing is commented as part of WT-3446 -#echo "checkpoint: 3 mixed tables with timestamps" -#$TEST_WRAPPER ./t -T 3 -t m -s +echo "checkpoint: 3 mixed tables with timestamps" +$TEST_WRAPPER ./t -T 3 -t m -s # We are done unless long tests are enabled. test "$TESTUTIL_ENABLE_LONG_TESTS" = "1" || exit 0 @@ -23,8 +22,8 @@ $TEST_WRAPPER ./t -T 6 -t l echo "checkpoint: 6 mixed tables" $TEST_WRAPPER ./t -T 6 -t m -#echo "checkpoint: 6 mixed tables with timestamps" -#$TEST_WRAPPER ./t -T 6 -t m -s +echo "checkpoint: 6 mixed tables with timestamps" +$TEST_WRAPPER ./t -T 6 -t m -s echo "checkpoint: 6 row-store tables" $TEST_WRAPPER ./t -T 6 -t r @@ -32,5 +31,5 @@ $TEST_WRAPPER ./t -T 6 -t r echo "checkpoint: 6 row-store tables, named checkpoint" $TEST_WRAPPER ./t -c 'TeSt' -T 6 -t r -#echo "checkpoint: 6 row-store tables, named checkpoint" -#$TEST_WRAPPER ./t -c 'TeSt' -T 6 -t r -s +echo "checkpoint: 6 row-store tables, named checkpoint" +$TEST_WRAPPER ./t -c 'TeSt' -T 6 -t r -s diff --git a/test/checkpoint/test_checkpoint.c b/test/checkpoint/test_checkpoint.c index e9e6518be00..2ee5aa912e4 100644 --- a/test/checkpoint/test_checkpoint.c +++ b/test/checkpoint/test_checkpoint.c @@ -93,23 +93,10 @@ main(int argc, char *argv[]) runs = atoi(__wt_optarg); break; case 's': - /* - * commented below block temporarily to avoid spurious - * test failures as per ticket WT-3446 and to be - * uncommented when WT-3386 is merged. - #ifdef HAVE_TIMESTAMPS g.use_timestamps = true; #endif break; - */ - /* - * The below code segment to be deleted when the - * above block is uncommented. - */ - fprintf(stderr, - "Checkpoint Timestamp testing is not supported\n"); - return (EXIT_FAILURE); case 't': switch (__wt_optarg[0]) { case 'c': |