summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hows <howsdav@gmail.com>2015-05-11 12:30:55 +1000
committerDavid Hows <howsdav@gmail.com>2015-05-11 12:45:09 +1000
commitd6d57add5e1cea598a48bb1669b3ab0bad4ec1a6 (patch)
tree140476c03649b2a96a96ca2ba4fdc6782fe51718
parent12b1d560248386e825c7deac40aac0c3cce48158 (diff)
downloadmongo-d6d57add5e1cea598a48bb1669b3ab0bad4ec1a6.tar.gz
Fix failed tests
-rw-r--r--test/checkpoint/test_checkpoint.c5
-rw-r--r--test/fops/t.c4
-rw-r--r--test/huge/huge.c6
-rw-r--r--test/thread/t.c6
4 files changed, 11 insertions, 10 deletions
diff --git a/test/checkpoint/test_checkpoint.c b/test/checkpoint/test_checkpoint.c
index 75ab75863ba..ac1dd7c9353 100644
--- a/test/checkpoint/test_checkpoint.c
+++ b/test/checkpoint/test_checkpoint.c
@@ -130,7 +130,7 @@ main(int argc, char *argv[])
/* Clean up on signal. */
(void)signal(SIGINT, onint);
- testutil_work_dir_from_path(g.home, 512, working_dir);
+ (void)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 +245,8 @@ cleanup(void)
g.running = 0;
g.ntables_created = 0;
- return (testutil_clean_work_dir(g.home));
+ (void)testutil_clean_work_dir(g.home);
+ return (0);
}
static int
diff --git a/test/fops/t.c b/test/fops/t.c
index 08989e25f90..aab224f28b5 100644
--- a/test/fops/t.c
+++ b/test/fops/t.c
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
if (argc != 0)
return (usage());
- testutil_work_dir_from_path(home, 512, working_dir);
+ (void)testutil_work_dir_from_path(home, 512, working_dir);
/* Clean up on signal. */
(void)signal(SIGINT, onint);
@@ -162,7 +162,7 @@ wt_startup(char *config_open)
int ret;
char config_buf[128];
- testutil_make_work_dir(home);
+ (void)testutil_make_work_dir(home);
snprintf(config_buf, sizeof(config_buf),
"create,error_prefix=\"%s\",cache_size=5MB%s%s",
diff --git a/test/huge/huge.c b/test/huge/huge.c
index c99c2c69e26..242788ae918 100644
--- a/test/huge/huge.c
+++ b/test/huge/huge.c
@@ -111,7 +111,7 @@ run(CONFIG *cp, int bigkey, size_t bytes)
bytes < MEGABYTE ? "B" : (bytes < GIGABYTE ? "MB" : "GB"),
cp->uri, cp->config, bigkey ? "key" : "value");
- testutil_make_work_dir(home);
+ (void)testutil_make_work_dir(home);
/*
* Open/create the database, connection, session and cursor; set the
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
{
CONFIG *cp;
size_t len, *lp;
- int ch, ret, small;
+ int ch, small;
char *working_dir;
if ((progname = strrchr(argv[0], DIR_DELIM)) == NULL)
@@ -200,7 +200,7 @@ main(int argc, char *argv[])
if (argc != 0)
usage();
- testutil_work_dir_from_path(home, 512, working_dir);
+ (void)testutil_work_dir_from_path(home, 512, working_dir);
/* Allocate a buffer to use. */
len = small ? ((size_t)SMALL_MAX) : ((size_t)4 * GIGABYTE);
diff --git a/test/thread/t.c b/test/thread/t.c
index 8cd637ec605..0a0d034e1fd 100644
--- a/test/thread/t.c
+++ b/test/thread/t.c
@@ -55,7 +55,7 @@ int
main(int argc, char *argv[])
{
u_int readers, writers;
- int ch, cnt, ret, runs;
+ int ch, cnt, runs;
char *config_open, *working_dir;
if ((progname = strrchr(argv[0], DIR_DELIM)) == NULL)
@@ -143,7 +143,7 @@ main(int argc, char *argv[])
if (argc != 0)
return (usage());
- testutil_work_dir_from_path(home, 512, working_dir);
+ (void)testutil_work_dir_from_path(home, 512, working_dir);
if (vary_nops && !multiple_files) {
fprintf(stderr,
@@ -190,7 +190,7 @@ wt_connect(char *config_open)
char config[512];
size_t print_count;
- (void)testutil_clean_work_dir(home);
+ testutil_clean_work_dir(home);
testutil_make_work_dir(home);
print_count = (size_t)snprintf(config, sizeof(config),