Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c0a6d0e5030a9235f4d84ada6b527e7f85349bf6 >--------------------------------------------------------------- commit c0a6d0e5030a9235f4d84ada6b527e7f85349bf6 Author: Ian Lynagh <[email protected]> Date: Fri Oct 12 22:43:07 2012 +0100 ghcilink001 is expected to fail when ghci is dynamic dynamic ghci can't load .a files >--------------------------------------------------------------- config/ghc | 3 ++- driver/testlib.py | 6 ++++++ mk/test.mk | 4 ++-- tests/ghci/linking/all.T | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/config/ghc b/config/ghc index 30e75bf..40f9919 100644 --- a/config/ghc +++ b/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/driver/testlib.py b/driver/testlib.py index 881abfc..25b550a 100644 --- a/driver/testlib.py +++ b/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/mk/test.mk b/mk/test.mk index 882ae60..e6de6d3 100644 --- a/mk/test.mk +++ b/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/tests/ghci/linking/all.T b/tests/ghci/linking/all.T index 0428516..ee68e13 100644 --- a/tests/ghci/linking/all.T +++ b/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']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
