diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2016-10-01 00:28:43 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-10-01 17:02:31 -0400 |
| commit | f869b23e9ac910720047b8ec078b52c3c2641627 (patch) | |
| tree | 906de9c652d44b9d619efe5e20ac4b6cdb1a4176 | |
| parent | 151edd89045c2aed20534c6826711db6a3f253c9 (diff) | |
| download | haskell-f869b23e9ac910720047b8ec078b52c3c2641627.tar.gz | |
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
| -rw-r--r-- | testsuite/mk/test.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 7defc68372..d4bd5feb66 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -32,19 +32,24 @@ ifeq "$(GhcUnregisterised)" "YES" EXTRA_HC_OPTS += -optc-fno-builtin endif -# TEST_HC_OPTS is passed to every invocation of TEST_HC +# 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 # we want tests to produce the same output for all test ways. TEST_HC_OPTS += -fno-warn-missed-specialisations -TEST_HC_OPTS += -fshow-warning-groups +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)" "" @@ -249,7 +254,7 @@ RUNTEST_OPTS += \ ifeq "$(list_broken)" "YES" set_list_broken = -e config.list_broken=True else -set_list_broken = +set_list_broken = endif # See Note [validate and testsuite speed] in toplevel Makefile. @@ -265,7 +270,7 @@ endif ifeq "$(accept)" "YES" setaccept = -e config.accept=1 else -setaccept = +setaccept = endif .PHONY: all boot test verbose accept fast slow list_broken |