[commit: ghc] master: Move -dno-debug-output to the end of the test flags (f869b23)
git at git.haskell.org
git at git.haskell.org
Sat Oct 1 21:50:45 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/f869b23e9ac910720047b8ec078b52c3c2641627/ghc
>---------------------------------------------------------------
commit f869b23e9ac910720047b8ec078b52c3c2641627
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date: Sat Oct 1 00:28:43 2016 -0400
Move -dno-debug-output to the end of the test flags
It is often convenient to copy the test invocation and remove this flag
in order to see compiler traces. Moving it to the end makes it easier to
remove.
Remove trailing whitespace
Reviewers: austin, thomie, bgamari
Reviewed By: bgamari
Differential Revision: https://phabricator.haskell.org/D2543
>---------------------------------------------------------------
f869b23e9ac910720047b8ec078b52c3c2641627
testsuite/mk/test.mk | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 7defc68..d4bd5fe 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -34,9 +34,7 @@ endif
# TEST_HC_OPTS is passed to every invocation of TEST_HC
# in nested Makefiles
-TEST_HC_OPTS = -dcore-lint -dcmm-lint -dno-debug-output -no-user-$(GhcPackageDbFlag) -rtsopts $(EXTRA_HC_OPTS)
-
-TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-history
+TEST_HC_OPTS = -dcore-lint -dcmm-lint -no-user-$(GhcPackageDbFlag) -rtsopts $(EXTRA_HC_OPTS)
ifeq "$(MinGhcVersion711)" "YES"
# Don't warn about missing specialisations. They can only occur with `-O`, but
@@ -45,6 +43,13 @@ TEST_HC_OPTS += -fno-warn-missed-specialisations
TEST_HC_OPTS += -fshow-warning-groups
endif
+# Add the no-debug-output last as it is often convenient to copy the test invocation
+# removing this line.
+TEST_HC_OPTS += -dno-debug-output
+
+TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-history
+
+
RUNTEST_OPTS =
ifeq "$(filter $(TargetOS_CPP), cygwin32 mingw32)" ""
More information about the ghc-commits
mailing list