[commit: ghc] master: Tweak settings for LLVM tests (22fcf9c)

git at git.haskell.org git at git.haskell.org
Wed Nov 4 04:20:41 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/22fcf9c1c8418d2a91fd7b784e7e345c23dff373/ghc

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

commit 22fcf9c1c8418d2a91fd7b784e7e345c23dff373
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Nov 2 18:14:08 2015 +1100

    Tweak settings for LLVM tests
    
    * The LLVM backend does not currently work on PowerPC so disable it.
    * Only run LLVM tests if the needed LLVM tools have been detected at
      configure time.
    
    Test Plan: Run LLVM tests on x86_64 and powerpc
    
    Reviewers: austin, bgamari, hvr, thomie
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1421


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

22fcf9c1c8418d2a91fd7b784e7e345c23dff373
 testsuite/mk/test.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index e20a522..013d67f 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -149,11 +149,11 @@ endif
 
 ifeq "$(LLC)" ""
 RUNTEST_OPTS += -e ghc_with_llvm=0
+else ifeq "$(TargetARCH_CPP)" "powerpc"
+RUNTEST_OPTS += -e ghc_with_llvm=0
 else ifneq "$(LLC)" "llc"
 # If we have a real detected value for LLVM, then it really ought to work
 RUNTEST_OPTS += -e ghc_with_llvm=1
-else ifneq "$(shell $(SHELL) -c 'llc --version | grep version' 2> /dev/null)" ""
-RUNTEST_OPTS += -e ghc_with_llvm=1
 else
 RUNTEST_OPTS += -e ghc_with_llvm=0
 endif



More information about the ghc-commits mailing list