diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-10-12 22:43:07 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-12 22:43:07 +0100 |
| commit | 8933b4e3d48cf55a51ba8822e73aca9ed4cc34cb (patch) | |
| tree | 21995d9915642de8c20b2b9f29b293fd528e0cda /testsuite | |
| parent | 187604820cea0c8ffc0cb268dc003e4aafb87ea9 (diff) | |
| download | haskell-8933b4e3d48cf55a51ba8822e73aca9ed4cc34cb.tar.gz | |
ghcilink001 is expected to fail when ghci is dynamic
dynamic ghci can't load .a files
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/config/ghc | 3 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 6 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 4 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/all.T | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index 30e75bf78a..40f9919f7a 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -55,7 +55,8 @@ if (ghc_with_threaded_rts == 1): if (ghc_with_dynamic_rts == 1): config.have_shared_libs = True -if (ghc_dynamic_by_default == 1): +config.ghc_dynamic_by_default = ghc_dynamic_by_default +if (ghc_dynamic_by_default): config.run_ways.append('static') else: if (ghc_with_dynamic_rts == 1): diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 881abfcac8..25b550a61f 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -356,6 +356,12 @@ def if_cygwin( f ): # --- +def if_ghci_dynamic( f ): + if config.ghc_dynamic_by_default: + return f + else: + return normal + def if_in_tree_compiler( f ): if config.in_tree_compiler: return f diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 882ae6036f..e6de6d327e 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -81,9 +81,9 @@ RUNTEST_OPTS += -e ghc_unregisterised=0 endif ifeq "$(GhcDynamicByDefault)" "YES" -RUNTEST_OPTS += -e ghc_dynamic_by_default=1 +RUNTEST_OPTS += -e ghc_dynamic_by_default=True else -RUNTEST_OPTS += -e ghc_dynamic_by_default=0 +RUNTEST_OPTS += -e ghc_dynamic_by_default=False endif ifeq "$(GhcWithSMP)" "YES" diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T index 04285168d0..ee68e1379e 100644 --- a/testsuite/tests/ghci/linking/all.T +++ b/testsuite/tests/ghci/linking/all.T @@ -1,5 +1,6 @@ test('ghcilink001', - extra_clean(['dir001/*','dir001']), + [if_ghci_dynamic(expect_fail), # dynamic ghci can't load '.a's + extra_clean(['dir001/*','dir001'])], run_command, ['$MAKE -s --no-print-directory ghcilink001']) |