diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-12 14:47:28 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-05-12 14:47:28 +1000 |
| commit | 9880d7563f74ec1e7033bae0e2f5aa312abc7b20 (patch) | |
| tree | 9d1893587cc34c117619340b8f2f673666a7e206 /test/checkpoint | |
| parent | 8f6b8fd4647186cc6ce68cb31ecd085c4323157e (diff) | |
| parent | df5a23d353d141afcbdb6cdced0538c87e99d389 (diff) | |
| download | mongo-9880d7563f74ec1e7033bae0e2f5aa312abc7b20.tar.gz | |
Merge branch 'develop' into encryption-api
Conflicts:
ext/compressors/lz4/lz4_compress.c
Diffstat (limited to 'test/checkpoint')
| -rw-r--r-- | test/checkpoint/test_checkpoint.c | 6 | ||||
| -rw-r--r-- | test/checkpoint/test_checkpoint.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/checkpoint/test_checkpoint.c b/test/checkpoint/test_checkpoint.c index 72700365dfe..3131a30bba4 100644 --- a/test/checkpoint/test_checkpoint.c +++ b/test/checkpoint/test_checkpoint.c @@ -130,8 +130,7 @@ main(int argc, char *argv[]) /* Clean up on signal. */ (void)signal(SIGINT, onint); - if ((ret = testutil_work_dir_from_path(g.home, 512, working_dir)) != 0) - testutil_die(ret, "provided directory name is too long"); + testutil_work_dir_from_path(g.home, 512, working_dir); printf("%s: process %" PRIu64 "\n", g.progname, (uint64_t)getpid()); for (cnt = 1; (runs == 0 || cnt <= runs) && g.status == 0; ++cnt) { @@ -245,7 +244,8 @@ cleanup(void) g.running = 0; g.ntables_created = 0; - return (testutil_clean_work_dir(g.home)); + testutil_clean_work_dir(g.home); + return (0); } static int diff --git a/test/checkpoint/test_checkpoint.h b/test/checkpoint/test_checkpoint.h index 411ebc50de9..914b68e522d 100644 --- a/test/checkpoint/test_checkpoint.h +++ b/test/checkpoint/test_checkpoint.h @@ -38,8 +38,8 @@ #include <string.h> #include <unistd.h> +#include "wt_internal.h" /* For __wt_XXX */ #include "test_util.i" -#include "wt_internal.h" /* For __wt_random */ #define URI_BASE "table:__wt" /* File name */ |