[commit: testsuite] master: Skip ghci/linking tests if we don't have ghci. (649fe1d)

Austin Seipp mad.one at gmail.com
Mon Feb 4 04:23:29 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/649fe1d6825e4424ff529f516f900204c723a16a

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

commit 649fe1d6825e4424ff529f516f900204c723a16a
Author: Austin Seipp <mad.one at gmail.com>
Date:   Sun Feb 3 21:22:51 2013 -0600

    Skip ghci/linking tests if we don't have ghci.
    
    Otherwise, you get annoying failures if you run 'make fast stage=1'.
    
    Signed-off-by: Austin Seipp <mad.one at gmail.com>

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

 tests/ghci/linking/all.T |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/ghci/linking/all.T b/tests/ghci/linking/all.T
index 39be389..bd87173 100644
--- a/tests/ghci/linking/all.T
+++ b/tests/ghci/linking/all.T
@@ -1,11 +1,12 @@
 test('ghcilink001',
      [if_ghci_dynamic(expect_fail), # dynamic ghci can't load '.a's
+      skip_if_no_ghci,
       extra_clean(['dir001/*','dir001'])],
      run_command,
      ['$MAKE -s --no-print-directory ghcilink001'])
 
 test('ghcilink002',
-     extra_clean(['dir002/*','dir002']),
+     [skip_if_no_ghci, extra_clean(['dir002/*','dir002'])],
      run_command,
      ['$MAKE -s --no-print-directory ghcilink002'])
 
@@ -13,6 +14,7 @@ test('ghcilink003',
      [
        if_os('mingw32', expect_broken(5289)), # still cannot load libstdc++
                                               # on Windows.  See also #4468.
+       skip_if_no_ghci,
        extra_clean(['dir003/*','dir003'])
      ],
      run_command,
@@ -20,12 +22,13 @@ test('ghcilink003',
 
 test('ghcilink004',
      [if_ghci_dynamic(expect_fail), # dynamic ghci can't load '.a's
+      skip_if_no_ghci,
       extra_clean(['dir004/*','dir004'])],
      run_command,
      ['$MAKE -s --no-print-directory ghcilink004'])
 
 test('ghcilink005',
-     extra_clean(['dir005/*','dir005']),
+     [skip_if_no_ghci, extra_clean(['dir005/*','dir005'])],
      run_command,
      ['$MAKE -s --no-print-directory ghcilink005'])
 
@@ -33,6 +36,7 @@ test('ghcilink006',
      [
        if_os('mingw32', expect_broken(5289)), # still cannot load libstdc++
                                               # on Windows.  See also #4468.
+       skip_if_no_ghci,
        extra_clean(['dir006/*','dir006'])
      ],
      run_command,





More information about the ghc-commits mailing list