summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2016-04-11 11:31:29 -0400
committerKeith Bostic <keith@wiredtiger.com>2016-04-11 11:31:29 -0400
commitec1e4d7a4fb07e9ed914e82b725d7eee0454edff (patch)
treea879695fc9a52dd2dbf8d2b76b3448219a6e3466 /test
parent4890b92d51f1a967b290e05d939eaaaa290363c1 (diff)
parentb2c668d45e21f801131b99f2053082c8bc995fe0 (diff)
downloadmongo-ec1e4d7a4fb07e9ed914e82b725d7eee0454edff.tar.gz
Merge branch 'develop' into wt-2535
Diffstat (limited to 'test')
-rw-r--r--test/bloom/Makefile.am2
-rw-r--r--test/cursor_order/Makefile.am2
-rw-r--r--test/huge/Makefile.am2
-rw-r--r--test/manydbs/Makefile.am2
-rw-r--r--test/manydbs/manydbs.c2
-rw-r--r--test/readonly/Makefile.am2
-rw-r--r--test/recovery/Makefile.am2
-rw-r--r--test/salvage/Makefile.am2
-rw-r--r--test/salvage/salvage.c2
-rw-r--r--test/thread/Makefile.am2
10 files changed, 10 insertions, 10 deletions
diff --git a/test/bloom/Makefile.am b/test/bloom/Makefile.am
index 86d87c70071..0592cec7e42 100644
--- a/test/bloom/Makefile.am
+++ b/test/bloom/Makefile.am
@@ -11,4 +11,4 @@ TESTS = $(noinst_PROGRAMS)
LOG_COMPILER = $(TEST_WRAPPER)
clean-local:
- rm -rf WiredTiger* *.core __*
+ rm -rf WiredTiger* *.core
diff --git a/test/cursor_order/Makefile.am b/test/cursor_order/Makefile.am
index c0c0ed639bf..8afb8f122d8 100644
--- a/test/cursor_order/Makefile.am
+++ b/test/cursor_order/Makefile.am
@@ -10,4 +10,4 @@ cursor_order_LDFLAGS = -static
TESTS = $(noinst_PROGRAMS)
clean-local:
- rm -rf WiredTiger* wt.* *.core __stats
+ rm -rf WT_TEST *.core
diff --git a/test/huge/Makefile.am b/test/huge/Makefile.am
index bc76bdc0f3c..151d3a40dd4 100644
--- a/test/huge/Makefile.am
+++ b/test/huge/Makefile.am
@@ -10,4 +10,4 @@ t_LDFLAGS = -static
TESTS = smoke.sh
clean-local:
- rm -rf WiredTiger* *.core __*
+ rm -rf WT_TEST *.core
diff --git a/test/manydbs/Makefile.am b/test/manydbs/Makefile.am
index 53559b25243..d347868aa4f 100644
--- a/test/manydbs/Makefile.am
+++ b/test/manydbs/Makefile.am
@@ -10,4 +10,4 @@ t_LDFLAGS = -static
TESTS = smoke.sh
clean-local:
- rm -rf WiredTiger* *.core __*
+ rm -rf WT_TEST *.core
diff --git a/test/manydbs/manydbs.c b/test/manydbs/manydbs.c
index 1d3412a7b06..63131d2652b 100644
--- a/test/manydbs/manydbs.c
+++ b/test/manydbs/manydbs.c
@@ -41,7 +41,7 @@
#include "test_util.i"
#define HOME_SIZE 512
-#define HOME_BASE "WT_HOME"
+#define HOME_BASE "WT_TEST"
static char home[HOME_SIZE]; /* Base home directory */
static char hometmp[HOME_SIZE]; /* Each conn home directory */
static const char *progname; /* Program name */
diff --git a/test/readonly/Makefile.am b/test/readonly/Makefile.am
index 3abcd2386a1..8028e2ab845 100644
--- a/test/readonly/Makefile.am
+++ b/test/readonly/Makefile.am
@@ -10,4 +10,4 @@ t_LDFLAGS = -static
TESTS = smoke.sh
clean-local:
- rm -rf WT_RD* WiredTiger* *.core __*
+ rm -rf WT_RD* *.core
diff --git a/test/recovery/Makefile.am b/test/recovery/Makefile.am
index 35f8dd15823..6865d5edf3e 100644
--- a/test/recovery/Makefile.am
+++ b/test/recovery/Makefile.am
@@ -15,4 +15,4 @@ TESTS = $(noinst_PROGRAMS)
LOG_COMPILER = $(TEST_WRAPPER)
clean-local:
- rm -rf WT_TEST* *.core __*
+ rm -rf WT_TEST.* *.core
diff --git a/test/salvage/Makefile.am b/test/salvage/Makefile.am
index 3e686dd2951..0fd46aefcb1 100644
--- a/test/salvage/Makefile.am
+++ b/test/salvage/Makefile.am
@@ -11,4 +11,4 @@ TESTS = $(noinst_PROGRAMS)
LOG_COMPILER = $(TEST_WRAPPER)
clean-local:
- rm -rf WiredTiger* *.core __*
+ rm -rf WiredTiger* __slvg* *.core
diff --git a/test/salvage/salvage.c b/test/salvage/salvage.c
index a1517d70787..5a084c5c164 100644
--- a/test/salvage/salvage.c
+++ b/test/salvage/salvage.c
@@ -170,7 +170,7 @@ run(int r)
printf("\t%s: run %d\n", __wt_page_type_string(page_type), r);
- CHECK(system("rm -f WiredTiger* __slvg.* __schema.*") == 0);
+ CHECK(system("rm -f WiredTiger* __slvg.*") == 0);
CHECK((res_fp = fopen(RSLT, "w")) != NULL);
/*
diff --git a/test/thread/Makefile.am b/test/thread/Makefile.am
index a58f019b513..ead783185f8 100644
--- a/test/thread/Makefile.am
+++ b/test/thread/Makefile.am
@@ -9,4 +9,4 @@ t_LDFLAGS = -static
TESTS = smoke.sh
clean-local:
- rm -rf WiredTiger* wt.* *.core __stats
+ rm -rf WT_TEST __stats *.core