summaryrefslogtreecommitdiff
path: root/testsuite/mk/test.mk
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-06-15 16:57:05 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2016-06-18 12:46:05 +0200
commitf72f23f9f6ff2914ec99fc86f67c89927f18ba47 (patch)
tree7389733b86a221d9007f8fd17c30ffaaec55fc2e /testsuite/mk/test.mk
parente02beb1849416f5af8ec56acd17f37b5dc7c24a4 (diff)
downloadhaskell-f72f23f9f6ff2914ec99fc86f67c89927f18ba47.tar.gz
Testsuite: run tests in <testdir>.run instead of /tmp
As discussed in Phab:D1187, this approach makes it a bit easier to inspect the test directory while working on a new test. The only tests that needed changes are the ones that refer to files in ancestor directories. Those files are now copied directly into the test directory. validate still runs the tests in a temporary directory in /tmp, see `Note [Running tests in /tmp]` in testsuite/driver/runtests.py. Update submodule hpc. Reviewed by: simonmar Differential Revision: https://phabricator.haskell.org/D2333 GHC Trac Issues: #11980
Diffstat (limited to 'testsuite/mk/test.mk')
-rw-r--r--testsuite/mk/test.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index d7e65bbf83..b5ea5a3ddd 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -192,11 +192,20 @@ RUNTEST_OPTS += --skip-perf-tests
endif
ifeq "$(CLEANUP)" "0"
-RUNTEST_OPTS += -e cleanup=False
+RUNTEST_OPTS += -e config.cleanup=False
else ifeq "$(CLEANUP)" "NO"
-RUNTEST_OPTS += -e cleanup=False
+RUNTEST_OPTS += -e config.cleanup=False
else
-RUNTEST_OPTS += -e cleanup=True
+RUNTEST_OPTS += -e config.cleanup=True
+endif
+
+ifeq "$(LOCAL)" "0"
+# See Note [Running tests in /tmp].
+RUNTEST_OPTS += -e config.local=False
+else ifeq "$(LOCAL)" "NO"
+RUNTEST_OPTS += -e config.local=False
+else
+RUNTEST_OPTS += -e config.local=True
endif
RUNTEST_OPTS += \