[commit: ghc] circleci-centos: testsuite: Mark tickets identified in #15467 as broken (5ef7619)

git at git.haskell.org git at git.haskell.org
Tue Dec 11 05:28:41 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : circleci-centos
Link       : http://ghc.haskell.org/trac/ghc/changeset/5ef76195bbdd2459f1dd34636a8cce5a938c699c/ghc

>---------------------------------------------------------------

commit 5ef76195bbdd2459f1dd34636a8cce5a938c699c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 10 22:01:48 2018 -0500

    testsuite: Mark tickets identified in #15467 as broken


>---------------------------------------------------------------

5ef76195bbdd2459f1dd34636a8cce5a938c699c
 testsuite/tests/codeGen/should_compile/all.T | 3 ++-
 testsuite/tests/codeGen/should_run/all.T     | 8 ++++++--
 testsuite/tests/concurrent/T13615/all.T      | 1 +
 testsuite/tests/concurrent/should_run/all.T  | 2 +-
 testsuite/tests/rts/all.T                    | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T
index 7a5e103..465a4a3 100644
--- a/testsuite/tests/codeGen/should_compile/all.T
+++ b/testsuite/tests/codeGen/should_compile/all.T
@@ -23,7 +23,7 @@ test('T7574', [cmm_src, omit_ways(llvm_ways)], compile, [''])
 test('T8205', normal, compile, ['-O0'])
 test('T9155', normal, compile, ['-O2'])
 test('T9303', normal, compile, ['-O2'])
-test('T9329', [cmm_src], compile, [''])
+test('T9329', [when(unregisterised, expect_broken(15467)), cmm_src], compile, [''])
 
 test('debug',
      [when((arch('powerpc64') or arch('powerpc64le')), expect_broken(11261))],
@@ -37,6 +37,7 @@ test('T12115', normal, compile, [''])
 test('T12355', normal, compile, [''])
 test('T14999',
      [when((arch('powerpc64') or arch('powerpc64le')), expect_broken(11261)),
+      when(unregisterised, skip),
       unless(opsys('linux') and arch('x86_64') and have_gdb() and
         have_readelf(), skip)],
      run_command, ['$MAKE -s --no-print-directory T14999'])
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 1dec2a6..0d5fcb9 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -72,8 +72,11 @@ test('cgrun065', normal, compile_and_run, [''])
 test('cgrun066', normal, compile_and_run, [''])
 test('cgrun067', [extra_files(['Cgrun067A.hs'])], compile_and_run, [''])
 test('cgrun068', reqlib('random'), compile_and_run, [''])
-test('cgrun069', omit_ways(['ghci']), multi_compile_and_run,
-                 ['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
+test('cgrun069',
+     [when(unregisterised, expect_broken(15467)),
+      omit_ways(['ghci'])],
+     multi_compile_and_run,
+     ['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
 test('cgrun070', normal, compile_and_run, [''])
 test('cgrun071', normal, compile_and_run, [''])
 test('cgrun072', normal, compile_and_run, [''])
@@ -161,6 +164,7 @@ test('T12855', normal, compile_and_run, [''])
 test('T9577', [ unless(arch('x86_64') or arch('i386'),skip),
                 when(opsys('darwin'), expect_broken(12937)),
                 when(opsys('mingw32'), expect_broken(12965)),
+                when(unregisterised, skip),
                 only_ways(['normal']) ], compile_and_run, [''])
 
 test('T13425', normal, compile_and_run, ['-O'])
diff --git a/testsuite/tests/concurrent/T13615/all.T b/testsuite/tests/concurrent/T13615/all.T
index 681f7b0..2ec8757 100644
--- a/testsuite/tests/concurrent/T13615/all.T
+++ b/testsuite/tests/concurrent/T13615/all.T
@@ -1,5 +1,6 @@
 test('T13615',
      [when(fast(), skip),
+      when(unregisterised, skip),
       req_smp, # needs -N support
       only_ways(threaded_ways),
       extra_files(['Parallel.hs', 'Memo.hs']),
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 08f439c..19b69cc 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -36,7 +36,7 @@ test('T3279', normal, compile_and_run, [''])
 
 # This test takes a long time with the default context switch interval
 test('T3429', [ extra_run_opts('+RTS -C0.001 -RTS'),
-                extra_ways(['debug_numa']) ],
+                unless(unregisterised, extra_ways(['debug_numa'])) ],
      compile_and_run, [''])
 
 # without -O, goes into an infinite loop
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 6339344..a02c0fb 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -303,6 +303,7 @@ test('T9045', [ omit_ways(['ghci']), extra_run_opts('10000 +RTS -A8k -RTS') ], c
 test('T9078', only_ways(['threaded1']), compile_and_run, [''])
 
 test('T10017', [ when(opsys('mingw32'), skip)
+               , when(unregisterised, skip)
                , req_smp
                , only_ways(threaded_ways), extra_run_opts('+RTS -N2 -RTS') ], compile_and_run, [''])
 
@@ -397,7 +398,7 @@ test('T10296a', [req_smp], run_command,
 
 test('T10296b', [only_ways('threaded2')], compile_and_run, [''])
 
-test('numa001', [ extra_run_opts('8'), extra_ways(['debug_numa']) ]
+test('numa001', [ extra_run_opts('8'), unless(unregisterised, extra_ways(['debug_numa'])) ]
                 , compile_and_run, [''])
 
 test('T12497', [ unless(opsys('mingw32'), skip)
@@ -423,6 +424,7 @@ test('T14497', [omit_ways(['profasm']), multi_cpu_race], compile_and_run, ['-O']
 test('T14695', [normal, ignore_stderr]
              , run_command, ['$MAKE -s --no-print-directory T14695'])
 test('T14702', [ ignore_stdout
+               , when(unregisterised, skip)
                , only_ways(['threaded1', 'threaded2'])
                , extra_run_opts('+RTS -A32m -N8 -T -RTS')
                ]



More information about the ghc-commits mailing list