diff options
| -rw-r--r-- | testsuite/tests/driver/T20436/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/driver/implicit-dyn-too/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/driver/recompPluginPackage/all.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/lib/integer/all.T | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/testsuite/tests/driver/T20436/all.T b/testsuite/tests/driver/T20436/all.T index 3a2aa6a46a..afad4ada8e 100644 --- a/testsuite/tests/driver/T20436/all.T +++ b/testsuite/tests/driver/T20436/all.T @@ -1 +1 @@ -test('T20436', [extra_files(['A.hs']), when(opsys('mingw32'), skip)], makefile_test, []) +test('T20436', [extra_files(['A.hs']), when(opsys('mingw32'), skip), unless(have_dynamic(), skip)], makefile_test, []) diff --git a/testsuite/tests/driver/implicit-dyn-too/all.T b/testsuite/tests/driver/implicit-dyn-too/all.T index 1e0b0ed96a..073b9c8d3a 100644 --- a/testsuite/tests/driver/implicit-dyn-too/all.T +++ b/testsuite/tests/driver/implicit-dyn-too/all.T @@ -1 +1,3 @@ -test('implicit-dyn-too', [when(opsys('mingw32'),skip), extra_files(['QuasiExpr.hs', 'QuasiQuote.hs']) ], makefile_test, []) +test('implicit-dyn-too', [when(opsys('mingw32'),skip) + ,unless(have_dynamic(), skip) + ,extra_files(['QuasiExpr.hs', 'QuasiQuote.hs']) ], makefile_test, []) diff --git a/testsuite/tests/driver/recompPluginPackage/all.T b/testsuite/tests/driver/recompPluginPackage/all.T index 08271d9c46..0c46018f66 100644 --- a/testsuite/tests/driver/recompPluginPackage/all.T +++ b/testsuite/tests/driver/recompPluginPackage/all.T @@ -15,6 +15,7 @@ else: test('recompPluginPackage', [extra_files(['p', 'q', 'Setup.hs']), when(opsys('mingw32'), fragile(16405)), - when(fast(), skip)], + when(fast(), skip), + unless(have_dynamic(), skip)], run_command, ['$MAKE -s --no-print-directory recompPluginPackage VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn]) diff --git a/testsuite/tests/lib/integer/all.T b/testsuite/tests/lib/integer/all.T index 96cb055b9c..4b3907749b 100644 --- a/testsuite/tests/lib/integer/all.T +++ b/testsuite/tests/lib/integer/all.T @@ -18,7 +18,7 @@ test('T18813', [], compile_and_run, ['']) test('T19170', [], compile_and_run, ['']) # skipped on Windows (doesn't support `-dynamic-too`) -test('T19264', [when(opsys('mingw32'),skip),extra_files(['T19264b.hs'])], compile, ['-dynamic-too --make -v0']) +test('T19264', [when(opsys('mingw32'),skip),unless(have_dynamic(),skip),extra_files(['T19264b.hs'])], compile, ['-dynamic-too --make -v0']) # skip ghci as it doesn't support unboxed tuples test('integerImportExport', [omit_ways(['ghci'])], compile_and_run, ['']) |