Commit f869b23e authored by Matthew Pickering's avatar Matthew Pickering Committed by Ben Gamari
Browse files

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
parent 151edd89
...@@ -32,19 +32,24 @@ ifeq "$(GhcUnregisterised)" "YES" ...@@ -32,19 +32,24 @@ ifeq "$(GhcUnregisterised)" "YES"
EXTRA_HC_OPTS += -optc-fno-builtin EXTRA_HC_OPTS += -optc-fno-builtin
endif 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 # in nested Makefiles
TEST_HC_OPTS = -dcore-lint -dcmm-lint -dno-debug-output -no-user-$(GhcPackageDbFlag) -rtsopts $(EXTRA_HC_OPTS) TEST_HC_OPTS = -dcore-lint -dcmm-lint -no-user-$(GhcPackageDbFlag) -rtsopts $(EXTRA_HC_OPTS)
TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-history
ifeq "$(MinGhcVersion711)" "YES" ifeq "$(MinGhcVersion711)" "YES"
# Don't warn about missing specialisations. They can only occur with `-O`, but # 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. # we want tests to produce the same output for all test ways.
TEST_HC_OPTS += -fno-warn-missed-specialisations TEST_HC_OPTS += -fno-warn-missed-specialisations
TEST_HC_OPTS += -fshow-warning-groups TEST_HC_OPTS += -fshow-warning-groups
endif 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 = RUNTEST_OPTS =
ifeq "$(filter $(TargetOS_CPP), cygwin32 mingw32)" "" ifeq "$(filter $(TargetOS_CPP), cygwin32 mingw32)" ""
...@@ -249,7 +254,7 @@ RUNTEST_OPTS += \ ...@@ -249,7 +254,7 @@ RUNTEST_OPTS += \
ifeq "$(list_broken)" "YES" ifeq "$(list_broken)" "YES"
set_list_broken = -e config.list_broken=True set_list_broken = -e config.list_broken=True
else else
set_list_broken = set_list_broken =
endif endif
# See Note [validate and testsuite speed] in toplevel Makefile. # See Note [validate and testsuite speed] in toplevel Makefile.
...@@ -265,7 +270,7 @@ endif ...@@ -265,7 +270,7 @@ endif
ifeq "$(accept)" "YES" ifeq "$(accept)" "YES"
setaccept = -e config.accept=1 setaccept = -e config.accept=1
else else
setaccept = setaccept =
endif endif
.PHONY: all boot test verbose accept fast slow list_broken .PHONY: all boot test verbose accept fast slow list_broken
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment