[commit: ghc] ghc-8.0: Testsuite: fixup req_profiling tests (#11496) (f5ccb52)
git at git.haskell.org
git at git.haskell.org
Wed Jan 27 12:05:42 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/f5ccb528dfd078e34cd0041f9a0ee56884677351/ghc
>---------------------------------------------------------------
commit f5ccb528dfd078e34cd0041f9a0ee56884677351
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Tue Jan 26 13:07:38 2016 +0100
Testsuite: fixup req_profiling tests (#11496)
* T2552 (#10037) is failng for all threaded opt_ways, not for WAY=prof.
* TH_spliceE5_prof (#11495) is failing when ghc_dynamic
* Rename ghci_dynamic to ghc_dynamic. It's the same thing.
(cherry picked from commit eeb67c9b833d95fa69932c34a3175054dacb83e2)
>---------------------------------------------------------------
f5ccb528dfd078e34cd0041f9a0ee56884677351
testsuite/driver/testlib.py | 2 +-
testsuite/tests/ghc-e/should_run/all.T | 2 +-
testsuite/tests/ghci/linking/all.T | 4 ++--
testsuite/tests/profiling/should_run/all.T | 2 +-
testsuite/tests/profiling/should_run/callstack002.stderr | 4 ++--
testsuite/tests/profiling/should_run/callstack002.stdout | 2 +-
testsuite/tests/th/Makefile | 2 +-
testsuite/tests/th/all.T | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 2ac9018..97a5a0d 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -336,7 +336,7 @@ def unless(b, f):
def doing_ghci():
return 'ghci' in config.run_ways
-def ghci_dynamic( ):
+def ghc_dynamic():
return config.ghc_dynamic
def fast():
diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T
index ae28653..a10fb0d 100644
--- a/testsuite/tests/ghc-e/should_run/all.T
+++ b/testsuite/tests/ghc-e/should_run/all.T
@@ -7,7 +7,7 @@ test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0
test('ghc-e006', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e006'])
test('T2228',
- [req_interp, when(ghci_dynamic(), expect_broken(7298))],
+ [req_interp, when(ghc_dynamic(), expect_broken(7298))],
run_command,
['$MAKE --no-print-directory -s T2228'])
test('T2636', req_interp, run_command, ['$MAKE --no-print-directory -s T2636'])
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T
index 7404de3..369ef28 100644
--- a/testsuite/tests/ghci/linking/all.T
+++ b/testsuite/tests/ghci/linking/all.T
@@ -1,5 +1,5 @@
test('ghcilink001',
- [when(ghci_dynamic(), expect_fail), # dynamic ghci can't load '.a's
+ [when(ghc_dynamic(), expect_fail), # dynamic ghci can't load '.a's
unless(doing_ghci, skip),
extra_clean(['dir001/*','dir001'])],
run_command,
@@ -43,7 +43,7 @@ test('ghcilink006',
test('T3333',
[extra_clean(['T3333.o']),
unless(doing_ghci, skip),
- unless(opsys('linux') or opsys('darwin') or ghci_dynamic(), expect_broken(3333))],
+ unless(opsys('linux') or opsys('darwin') or ghc_dynamic(), expect_broken(3333))],
run_command,
['$MAKE -s --no-print-directory T3333'])
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index ca37fe5..52bd62c 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -72,7 +72,7 @@ test('T680',
test('T2552',
[ req_profiling, extra_ways(['prof']), only_ways(prof_ways),
- expect_broken_for(10037,['prof'])],
+ expect_broken_for(10037, opt_ways)],
compile_and_run,
[''])
diff --git a/testsuite/tests/profiling/should_run/callstack002.stderr b/testsuite/tests/profiling/should_run/callstack002.stderr
index b4bb0d5..e1f249a 100644
--- a/testsuite/tests/profiling/should_run/callstack002.stderr
+++ b/testsuite/tests/profiling/should_run/callstack002.stderr
@@ -1,5 +1,5 @@
f: 42
-Stack trace:
+CallStack (from -prof):
Main.f (callstack002.hs:10:7-43)
Main.map.go (callstack002.hs:15:21-23)
Main.map.go (callstack002.hs:15:21-34)
@@ -7,7 +7,7 @@ Stack trace:
Main.main.xs (callstack002.hs:18:12-24)
Main.CAF (<entire-module>)
f: 43
-Stack trace:
+CallStack (from -prof):
Main.f (callstack002.hs:10:7-43)
Main.map.go (callstack002.hs:15:21-23)
Main.map.go (callstack002.hs:15:21-34)
diff --git a/testsuite/tests/profiling/should_run/callstack002.stdout b/testsuite/tests/profiling/should_run/callstack002.stdout
index 480090d..8116c2c 100644
--- a/testsuite/tests/profiling/should_run/callstack002.stdout
+++ b/testsuite/tests/profiling/should_run/callstack002.stdout
@@ -1,5 +1,5 @@
[84,86]
-Stack trace:
+CallStack (from -prof):
Main.f (callstack002.hs:10:38-42)
Main.f (callstack002.hs:10:7-43)
Main.map.go (callstack002.hs:15:21-23)
diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile
index 4fb508f..5e47e8c 100644
--- a/testsuite/tests/th/Makefile
+++ b/testsuite/tests/th/Makefile
@@ -16,7 +16,7 @@ HC_OPTS = -XTemplateHaskell -package template-haskell
TH_spliceE5_prof::
$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.dyn_o TH_spliceE5_prof*.dyn_hi TH_spliceE5_prof
- '$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) $(ghcThWayFlags) --make -v0 TH_spliceE5_prof.hs -c
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) $(ghcThWayFlags) --make -no-link -v0 TH_spliceE5_prof.hs
# Using `-osuf .p.o` should work. Note the dot before the `p` (#9760), and
# the dot between the `p` and the `o` (#5554).
'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf .p.o -o $@
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 88b6a12..82fabb3 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -45,7 +45,7 @@ test('TH_NestedSplices',
# normal way first, which is why the work is done by a Makefile rule.
test('TH_spliceE5_prof',
[req_profiling,
- omit_ways(['ghci']),
+ when(ghc_dynamic(), expect_broken(11495)),
extra_clean(['TH_spliceE5_prof_Lib.p.o', 'TH_spliceE5_prof_Lib.hi',
'TH_spliceE5_prof_Lib.dyn_o', 'TH_spliceE5_prof_Lib.dyn_hi',
'TH_spliceE5_prof.dyn_o', 'TH_spliceE5_prof.dyn_hi',
More information about the ghc-commits
mailing list