diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2023-03-27 16:02:55 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-04-11 19:24:54 -0400 |
| commit | bc4795d207c132fbfe118958f7f39b140115f5bd (patch) | |
| tree | 78f37e3eb587279e4007b20dbc81091acaed2d6d /testsuite | |
| parent | 3ba77b369a170ba68f4eb5c8f3ae13e03dcbb28d (diff) | |
| download | haskell-bc4795d207c132fbfe118958f7f39b140115f5bd.tar.gz | |
Add support for -debug in the testsuite
Confusingly, GhcDebugged referred to GhcDebugAssertions.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/driver/testglobals.py | 3 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 3 | ||||
| -rw-r--r-- | testsuite/ghc-config/ghc-config.hs | 3 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index 732b71b1ad..3984291ff8 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -64,6 +64,9 @@ class TestConfig: # Was the compiler compiled with DEBUG? self.compiler_debugged = False + # Was the compiler compiled with -debug? + self.debug_rts = False + # Was the compiler compiled with LLVM? self.ghc_built_by_llvm = False diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index f79be903a5..6fa0a58455 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -681,6 +681,9 @@ def compiler_profiled( ) -> bool: def compiler_debugged( ) -> bool: return config.compiler_debugged +def debug_rts( ) -> bool: + return config.debug_rts + def have_gdb( ) -> bool: return config.have_gdb diff --git a/testsuite/ghc-config/ghc-config.hs b/testsuite/ghc-config/ghc-config.hs index b308cf61d5..b792643dbb 100644 --- a/testsuite/ghc-config/ghc-config.hs +++ b/testsuite/ghc-config/ghc-config.hs @@ -13,12 +13,13 @@ main = do getGhcFieldOrFail fields "TARGETPLATFORM" "Target platform" getGhcFieldOrFail fields "TargetOS_CPP" "Target OS" getGhcFieldOrFail fields "TargetARCH_CPP" "Target architecture" + getGhcFieldOrFail fields "RTSWay" "RTS way" info <- readProcess ghc ["--info"] "" let fields = read info :: [(String,String)] getGhcFieldOrFail fields "GhcStage" "Stage" - getGhcFieldOrFail fields "GhcDebugged" "Debug on" + getGhcFieldOrFail fields "GhcDebugAssertions" "Debug on" getGhcFieldOrFail fields "GhcWithNativeCodeGen" "Have native code generator" getGhcFieldOrFail fields "GhcWithInterpreter" "Have interpreter" getGhcFieldOrFail fields "GhcWithRtsLinker" "target has RTS linker" diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 7c654df9ae..bb5d138856 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -78,7 +78,7 @@ endif RUNTEST_OPTS += -e "ghc_compiler_always_flags='$(TEST_HC_OPTS)'" -ifeq "$(GhcDebugged)" "YES" +ifeq "$(GhcDebugAssertions)" "YES" RUNTEST_OPTS += -e "config.compiler_debugged=True" else RUNTEST_OPTS += -e "config.compiler_debugged=False" |