[commit: testsuite] master: Run T7478, plugins06, T7918 only when dynamic libraries are available (435c595)

git at git.haskell.org git at git.haskell.org
Tue Nov 12 10:12:37 UTC 2013


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/435c5955359d6e46a2fb905231678ac37ac0e71a/testsuite

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

commit 435c5955359d6e46a2fb905231678ac37ac0e71a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 12 11:08:36 2013 +0100

    Run T7478, plugins06, T7918 only when dynamic libraries are available
    
    as they fail in a non-helpful way otherwise. This should help the
    testsuite pass on travis.


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

435c5955359d6e46a2fb905231678ac37ac0e71a
 tests/ghc-api/T7478/all.T  |    8 +++++++-
 tests/plugins/all.T        |    1 +
 tests/quasiquotation/all.T |    1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/ghc-api/T7478/all.T b/tests/ghc-api/T7478/all.T
index 71a4a84..2d6fb08 100644
--- a/tests/ghc-api/T7478/all.T
+++ b/tests/ghc-api/T7478/all.T
@@ -1,2 +1,8 @@
-test('T7478', [extra_clean(['A','A.exe','B.o','B.hi','C.o','C.hi']), when(opsys('darwin'), expect_broken(8294))], run_command, ['$MAKE -s --no-print-directory T7478'])
+test('T7478',
+  [ unless(have_dynamic(),skip),
+  , extra_clean(['A','A.exe','B.o','B.hi','C.o','C.hi'])
+  , when(opsys('darwin'), expect_broken(8294))
+  ],
+  run_command,
+  ['$MAKE -s --no-print-directory T7478'])
 
diff --git a/tests/plugins/all.T b/tests/plugins/all.T
index 8f611c8..7e5f9b4 100644
--- a/tests/plugins/all.T
+++ b/tests/plugins/all.T
@@ -34,6 +34,7 @@ test('plugins05',
 
 test('plugins06',
      [ extra_clean(['LinkerTicklingPlugin.hi', 'LinkerTicklingPlugin.o']),
+       unless(have_dynamic(),skip),
        only_ways([config.ghc_plugin_way]) ],
      multimod_compile_and_run, ['plugins06', '-package ghc'])
 
diff --git a/tests/quasiquotation/all.T b/tests/quasiquotation/all.T
index 9f0335a..5ccfc21 100644
--- a/tests/quasiquotation/all.T
+++ b/tests/quasiquotation/all.T
@@ -12,6 +12,7 @@ test('T7918',
        extra_run_opts('"' + config.libdir + '"'),
        only_compiler_types(['ghc']),
        only_ways(['normal']),
+       unless(have_dynamic(),skip),
        extra_clean(['T7918A.hi', 'T7918A.o', 'T7918A.dyn_hi', 'T7918A.dyn_o', 
                     'T7918B.hi', 'T7918B.o', 'T7918B.dyn_hi', 'T7918B.dyn_o'])],
       compile_and_run,



More information about the ghc-commits mailing list