diff options
author | Peter Trommler <ptrommler@acm.org> | 2016-02-25 14:46:13 +0100 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-02-25 15:41:28 +0100 |
commit | feb19eae3d7b70a2c0038624dcfe2c417213d5c5 (patch) | |
tree | 5a67272fae260f1b55f3a9ff7bd70c9d37b20ea5 | |
parent | c1efdcc40209bc4f0ded85269eb8ba49c7d1ff09 (diff) | |
download | haskell-feb19eae3d7b70a2c0038624dcfe2c417213d5c5.tar.gz |
testsuite: mark tests broken on powerpc64
The following tests fail on powerpc64 and have a ticket.
Mark those tests as expect_broken.
Here are the details:
The PowerPC native code generator does not support DWARF debug
information. This is tracked in ticket #11261. Mark the respective
tests broken on powerpc64.
testsuite: mark print022 broken on powerpc64
Ticket #11262 tracks difference in stdout for print022.
testsuite: mark recomp015 broken on powerpc64
testsuite: mark recomp011 broken on powerpc64
This is tracked as ticket #11323 and #11260.
testsuite: mark linker tests broken on powerpc64
Ticket #11259 tracks tests failing because there is no RTS
linker on powerpc64.
Test Plan: validate
Reviewers: erikd, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1928
GHC Trac Issues: #11259, #11260, #11261, #11262, #11323
-rw-r--r-- | rts/Interpreter.c | 4 | ||||
-rw-r--r-- | testsuite/tests/codeGen/should_compile/all.T | 6 | ||||
-rw-r--r-- | testsuite/tests/concurrent/prog001/all.T | 1 | ||||
-rw-r--r-- | testsuite/tests/driver/all.T | 3 | ||||
-rw-r--r-- | testsuite/tests/driver/recomp011/all.T | 3 | ||||
-rw-r--r-- | testsuite/tests/driver/recomp015/all.T | 3 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T10052/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/all.T | 7 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/dynCompileExpr/all.T | 1 | ||||
-rw-r--r-- | testsuite/tests/ghci.debugger/scripts/all.T | 3 | ||||
-rw-r--r-- | testsuite/tests/ghci/linking/all.T | 1 | ||||
-rw-r--r-- | testsuite/tests/ghci/prog001/prog001.T | 1 | ||||
-rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/rts/all.T | 7 |
14 files changed, 29 insertions, 15 deletions
diff --git a/rts/Interpreter.c b/rts/Interpreter.c index 0e981007a3..7734aacd36 100644 --- a/rts/Interpreter.c +++ b/rts/Interpreter.c @@ -674,7 +674,7 @@ do_apply: // the appropriate info table in the gap. for (i = 0; i < arity; i++) { Sp[(int)i-1] = Sp[i]; - // ^^^^^ careful, i-1 might be negative, but i in unsigned + // ^^^^^ careful, i-1 might be negative, but i is unsigned } Sp[arity-1] = app_ptrs_itbl[n-arity-1]; Sp--; @@ -736,7 +736,7 @@ do_apply: // the appropriate info table in the gap. for (i = 0; i < arity; i++) { Sp[(int)i-1] = Sp[i]; - // ^^^^^ careful, i-1 might be negative, but i in unsigned + // ^^^^^ careful, i-1 might be negative, but i is unsigned } Sp[arity-1] = app_ptrs_itbl[n-arity-1]; Sp--; diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T index a8ca738298..1d99fbbf71 100644 --- a/testsuite/tests/codeGen/should_compile/all.T +++ b/testsuite/tests/codeGen/should_compile/all.T @@ -26,9 +26,11 @@ test('T9155', normal, compile, ['-O2']) test('T9303', normal, compile, ['-O2']) test('T9329', [cmm_src], compile, ['']) -test('debug', extra_clean(['debug.cmm']), +test('debug', [ extra_clean(['debug.cmm']), + when(arch('powerpc64'), expect_broken(11261))], run_command, ['$MAKE -s --no-print-directory debug']) test('T9964', normal, compile, ['-O']) test('T10518', [cmm_src], compile, ['']) -test('T10667', normal, compile, ['-g']) +test('T10667', [ when(arch('powerpc64'), expect_broken(11261)) ], + compile, ['-g']) diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T index a3ba7b61f1..79a314673c 100644 --- a/testsuite/tests/concurrent/prog001/all.T +++ b/testsuite/tests/concurrent/prog001/all.T @@ -14,6 +14,7 @@ test('concprog001', [when(fast(), skip), + when(arch('powerpc64'), expect_broken(11259)), only_ways(['threaded2']), extra_clean(['Arithmetic.hi', 'Arithmetic.o', 'Converter.hi', 'Converter.o', diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index 5a19366e23..e52eae398b 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -326,7 +326,8 @@ test('dynHelloWorld', ['']) test('T5313', - extra_run_opts('"' + config.libdir + '"'), + [ when(arch('powerpc64'), expect_broken(11259)), + extra_run_opts('"' + config.libdir + '"')], compile_and_run, ['-package ghc']) diff --git a/testsuite/tests/driver/recomp011/all.T b/testsuite/tests/driver/recomp011/all.T index b7643f0ed1..9d568660a4 100644 --- a/testsuite/tests/driver/recomp011/all.T +++ b/testsuite/tests/driver/recomp011/all.T @@ -1,7 +1,8 @@ # Test for #3589, recompiling when #included files change test('recomp011', - [ clean_cmd('$MAKE -s clean') ], + [ when(arch('powerpc64'), expect_broken(11260)), + clean_cmd('$MAKE -s clean') ], run_command, ['$MAKE -s --no-print-directory recomp011']) diff --git a/testsuite/tests/driver/recomp015/all.T b/testsuite/tests/driver/recomp015/all.T index 1b91218446..4e1512a8ae 100644 --- a/testsuite/tests/driver/recomp015/all.T +++ b/testsuite/tests/driver/recomp015/all.T @@ -4,7 +4,8 @@ test('recomp015', [ clean_cmd('$MAKE -s clean'), # See ticket:11022#comment:7 unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip), - when(arch('arm'), skip)], + when(arch('arm'), skip), + when(arch('powerpc64'), expect_broken(11323))], run_command, ['$MAKE -s --no-print-directory recomp015']) diff --git a/testsuite/tests/ghc-api/T10052/all.T b/testsuite/tests/ghc-api/T10052/all.T index bb73f85fa1..40b80cdc5e 100644 --- a/testsuite/tests/ghc-api/T10052/all.T +++ b/testsuite/tests/ghc-api/T10052/all.T @@ -1,2 +1,2 @@ -test('T10052', normal, run_command, +test('T10052', when(arch('powerpc64'), expect_broken(11259)), run_command, ['$MAKE -s --no-print-directory T10052']) diff --git a/testsuite/tests/ghc-api/all.T b/testsuite/tests/ghc-api/all.T index e3e31da70c..8aa2ede97f 100644 --- a/testsuite/tests/ghc-api/all.T +++ b/testsuite/tests/ghc-api/all.T @@ -2,16 +2,17 @@ test('ghcApi', normal, compile_and_run, ['-package ghc']) test('T6145', normal, run_command, ['$MAKE -s --no-print-directory T6145']) -test('T8639_api', normal, +test('T8639_api', when(arch('powerpc64'), expect_broken(11259)), run_command, ['$MAKE -s --no-print-directory T8639_api']) -test('T8628', normal, +test('T8628', when(arch('powerpc64'), expect_broken(11259)), run_command, ['$MAKE -s --no-print-directory T8628']) test('T9595', extra_run_opts('"' + config.libdir + '"'), compile_and_run, ['-package ghc']) -test('T10508_api', extra_run_opts('"' + config.libdir + '"'), +test('T10508_api', [ extra_run_opts('"' + config.libdir + '"'), + when(arch('powerpc64'), expect_broken(11259))], compile_and_run, ['-package ghc']) test('T10942', extra_run_opts('"' + config.libdir + '"'), diff --git a/testsuite/tests/ghc-api/dynCompileExpr/all.T b/testsuite/tests/ghc-api/dynCompileExpr/all.T index c6034eab6b..cefbe691f1 100644 --- a/testsuite/tests/ghc-api/dynCompileExpr/all.T +++ b/testsuite/tests/ghc-api/dynCompileExpr/all.T @@ -1,5 +1,6 @@ test('dynCompileExpr', [ extra_run_opts('"' + config.libdir + '"'), when(opsys('mingw32'), expect_broken_for(5987, ['dyn'])), + when(arch('powerpc64'), expect_broken(11259)), omit_ways(prof_ways) ], # cannot run interpreted code with -prof compile_and_run, ['-package ghc']) diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T index 359f0f981d..113eadf9ce 100644 --- a/testsuite/tests/ghci.debugger/scripts/all.T +++ b/testsuite/tests/ghci.debugger/scripts/all.T @@ -21,7 +21,8 @@ test('print018', normal, ghci_script, ['print018.script']) test('print019', normal, ghci_script, ['print019.script']) test('print020', normal, ghci_script, ['print020.script']) test('print021', normal, ghci_script, ['print021.script']) -test('print022', normal, ghci_script, ['print022.script']) +test('print022', when(arch('powerpc64'), expect_broken(11262)), + ghci_script, ['print022.script']) test('print023', normal, ghci_script, ['print023.script']) test('print024', normal, ghci_script, ['print024.script']) test('print025', normal, ghci_script, ['print025.script']) diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T index 369ef284c8..b542c16415 100644 --- a/testsuite/tests/ghci/linking/all.T +++ b/testsuite/tests/ghci/linking/all.T @@ -20,6 +20,7 @@ test('ghcilink003', test('ghcilink004', [unless(doing_ghci, skip), + when(arch('powerpc64'), expect_broken(11259)), extra_clean(['dir004/local.package.conf/*', 'dir004/*', 'dir004']) ], run_command, diff --git a/testsuite/tests/ghci/prog001/prog001.T b/testsuite/tests/ghci/prog001/prog001.T index af221e6fd9..7c8e43068c 100644 --- a/testsuite/tests/ghci/prog001/prog001.T +++ b/testsuite/tests/ghci/prog001/prog001.T @@ -1,5 +1,6 @@ test('prog001', [extra_clean(['C.hs', 'D.hs', 'D.hi', 'D.o']), cmd_prefix('ghciWayFlags=' + config.ghci_way_flags), + when(arch('powerpc64'), expect_broken_for(11259,['ghci-ext'])), unless(opsys('mingw32'),extra_ways(['ghci-ext']))], ghci_script, ['prog001.script']) diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index d7af2901a2..3827bb6612 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -4,10 +4,12 @@ test('ghci001', combined_output, ghci_script, ['ghci001.script']) test('ghci002', combined_output, ghci_script, ['ghci002.script']) test('ghci003', combined_output, ghci_script, ['ghci003.script']) test('ghci004', [ combined_output, + when(arch('powerpc64'), expect_broken_for(11259,['ghci-ext'])), unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ], ghci_script, ['ghci004.script']) test('ghci005', combined_output, ghci_script, ['ghci005.script']) test('ghci006', [ combined_output, + when(arch('powerpc64'), expect_broken_for(11259,['ghci-ext'])), unless(opsys('mingw32'),extra_ways(['ghci-ext'])) ], ghci_script, ['ghci006.script']) test('ghci007', combined_output, ghci_script, ['ghci007.script']) diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 3a09c51527..82a3a43269 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -171,8 +171,8 @@ def checkDynAsm(actual_file, normaliser): # These should have extra_clean() arguments, but I need # to somehow extract out the name of DLLs to do that -test('T5435_v_asm', normal, run_command, ['$MAKE -s --no-print-directory T5435_v_asm']) -test('T5435_v_gcc', normal, run_command, ['$MAKE -s --no-print-directory T5435_v_gcc']) +test('T5435_v_asm', when(arch('powerpc64'), expect_broken(11259)), run_command, ['$MAKE -s --no-print-directory T5435_v_asm']) +test('T5435_v_gcc', when(arch('powerpc64'), expect_broken(11259)), run_command, ['$MAKE -s --no-print-directory T5435_v_gcc']) test('T5435_dyn_asm', check_stdout(checkDynAsm), run_command, ['$MAKE -s --no-print-directory T5435_dyn_asm']) test('T5435_dyn_gcc', normal , run_command, ['$MAKE -s --no-print-directory T5435_dyn_gcc']) @@ -229,7 +229,8 @@ test('T7919', [extra_clean(['T7919A.o','T7919A.hi', test('T8035', normal, compile_and_run, ['']) test('linker_unload', - [ extra_clean(['Test.o','Test.hi', 'linker_unload']) ], + [ when(arch('powerpc64'), expect_broken(11259)), + extra_clean(['Test.o','Test.hi', 'linker_unload']) ], run_command, ['$MAKE -s --no-print-directory linker_unload']) |