WT-3182 Switch make-check to run the short test suite by default (#3313)

6 files changed, 27 insertions, 26 deletions

diff --git a/test/csuite/wt2246_col_append/main.c b/test/csuite/wt2246_col_append/main.c
index 4b352b26051..976e2269da6 100644
--- a/test/csuite/wt2246_col_append/main.c
+++ b/test/csuite/wt2246_col_append/main.c
@@ -101,9 +101,10 @@ main(int argc, char *argv[])
 	uint64_t i, id;
 	char buf[100];
 
+	if (!testutil_enable_long_tests())	/* Ignore unless requested */
+		return (EXIT_SUCCESS);
+
 	opts = &_opts;
-	if (testutil_disable_long_tests())
-		return (0);
 	memset(opts, 0, sizeof(*opts));
 	opts->table_type = TABLE_ROW;
 	opts->n_append_threads = N_APPEND_THREADS;
diff --git a/test/csuite/wt2323_join_visibility/main.c b/test/csuite/wt2323_join_visibility/main.c
index 239a3f300d0..a61f707e008 100644
--- a/test/csuite/wt2323_join_visibility/main.c
+++ b/test/csuite/wt2323_join_visibility/main.c
@@ -92,10 +92,11 @@ main(int argc, char *argv[])
 	TEST_OPTS *opts, _opts;
 	const char *tablename;
 
+	if (!testutil_enable_long_tests())	/* Ignore unless requested */
+		return (EXIT_SUCCESS);
+
 	opts = &_opts;
 	sharedopts = &_sharedopts;
-	if (testutil_disable_long_tests())
-		return (0);
 	memset(opts, 0, sizeof(*opts));
 	memset(sharedopts, 0, sizeof(*sharedopts));
 
diff --git a/test/csuite/wt2535_insert_race/main.c b/test/csuite/wt2535_insert_race/main.c
index ae18760a829..ba17d485e07 100644
--- a/test/csuite/wt2535_insert_race/main.c
+++ b/test/csuite/wt2535_insert_race/main.c
@@ -49,9 +49,10 @@ main(int argc, char *argv[])
 	uint64_t current_value;
 	int i;
 
+	if (!testutil_enable_long_tests())	/* Ignore unless requested */
+		return (EXIT_SUCCESS);
+
 	opts = &_opts;
-	if (testutil_disable_long_tests())
-		return (0);
 	memset(opts, 0, sizeof(*opts));
 	opts->nthreads = 10;
 	opts->nrecords = 1000;
diff --git a/test/csuite/wt2834_join_bloom_fix/main.c b/test/csuite/wt2834_join_bloom_fix/main.c
index 7c80496f1b6..f2c54b942be 100644
--- a/test/csuite/wt2834_join_bloom_fix/main.c
+++ b/test/csuite/wt2834_join_bloom_fix/main.c
@@ -59,11 +59,11 @@ main(int argc, char *argv[])
 	char flaguri[256];
 	char joinuri[256];
 
+	if (!testutil_enable_long_tests())	/* Ignore unless requested */
+		return (EXIT_SUCCESS);
+
 	opts = &_opts;
-	if (testutil_disable_long_tests())
-		return (0);
 	memset(opts, 0, sizeof(*opts));
-
 	testutil_check(testutil_parse_opts(argc, argv, opts));
 	testutil_make_work_dir(opts->home);
 
diff --git a/test/csuite/wt2853_perf/main.c b/test/csuite/wt2853_perf/main.c
index 6cec9634cd1..b365b03493a 100644
--- a/test/csuite/wt2853_perf/main.c
+++ b/test/csuite/wt2853_perf/main.c
@@ -82,11 +82,11 @@ main(int argc, char *argv[])
 	int i, nfail;
 	const char *tablename;
 
+	if (!testutil_enable_long_tests())	/* Ignore unless requested */
+		return (EXIT_SUCCESS);
+
 	opts = &_opts;
 	sharedopts = &_sharedopts;
-
-	if (testutil_disable_long_tests())
-		return (0);
 	memset(opts, 0, sizeof(*opts));
 	memset(sharedopts, 0, sizeof(*sharedopts));
 	memset(insert_args, 0, sizeof(insert_args));
diff --git a/test/csuite/wt2909_checkpoint_integrity/main.c b/test/csuite/wt2909_checkpoint_integrity/main.c
index ddf249fb406..0ae81543050 100644
--- a/test/csuite/wt2909_checkpoint_integrity/main.c
+++ b/test/csuite/wt2909_checkpoint_integrity/main.c
@@ -96,9 +96,8 @@ static void run_check_subtest(TEST_OPTS *, const char *, uint64_t, bool,
     uint64_t *);
 static void run_check_subtest_range(TEST_OPTS *, const char *, bool);
 static int run_process(TEST_OPTS *, const char *, char *[], int *);
-static int subtest_main(int, char *[], bool);
+static void subtest_main(int, char *[], bool);
 static void subtest_populate(TEST_OPTS *, bool);
-int main(int, char *[]);
 
 extern int   __wt_optind;
 
@@ -446,7 +445,7 @@ run_process(TEST_OPTS *opts, const char *prog, char *argv[], int *status)
  * subtest_main --
  *	The main program for the subtest
  */
-static int
+static void
 subtest_main(int argc, char *argv[], bool close_test)
 {
 	TEST_OPTS *opts, _opts;
@@ -454,8 +453,6 @@ subtest_main(int argc, char *argv[], bool close_test)
 	char config[1024], filename[1024];
 	struct rlimit rlim;
 
-	if (testutil_disable_long_tests())
-		return (0);
 	opts = &_opts;
 	memset(opts, 0, sizeof(*opts));
 	memset(&rlim, 0, sizeof(rlim));
@@ -499,8 +496,6 @@ subtest_main(int argc, char *argv[], bool close_test)
 	subtest_populate(opts, close_test);
 
 	testutil_cleanup(opts);
-
-	return (0);
 }
 
 /*
@@ -622,8 +617,9 @@ main(int argc, char *argv[])
 	uint64_t nresults;
 	const char *debugger;
 
-	if (testutil_disable_long_tests())
-		return (0);
+	if (!testutil_enable_long_tests())	/* Ignore unless requested */
+		return (EXIT_SUCCESS);
+
 	opts = &_opts;
 	memset(opts, 0, sizeof(*opts));
 	debugger = NULL;
@@ -635,11 +631,13 @@ main(int argc, char *argv[])
 		opts->nrecords = 50000;
 
 	while (argc > 0) {
-		if (strcmp(argv[0], "subtest") == 0)
-			return (subtest_main(argc, argv, false));
-		else if (strcmp(argv[0], "subtest_close") == 0)
-			return (subtest_main(argc, argv, true));
-		else if (strcmp(argv[0], "gdb") == 0)
+		if (strcmp(argv[0], "subtest") == 0) {
+			subtest_main(argc, argv, false);
+			return (0);
+		} else if (strcmp(argv[0], "subtest_close") == 0) {
+			subtest_main(argc, argv, true);
+			return (0);
+		} else if (strcmp(argv[0], "gdb") == 0)
 			debugger = "/usr/bin/gdb";
 		else
 			testutil_assert(false);