[commit: testsuite] master: Fix library way detection; fixes the ImpSafeOnly* tests when BINDIST=YES (b32d38a)

Ian Lynagh igloo at earth.li
Fri May 10 15:40:39 CEST 2013


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

On branch  : master

https://github.com/ghc/testsuite/commit/b32d38a1e0f615aad0ecec95dcae4a541d8cd1bb

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

commit b32d38a1e0f615aad0ecec95dcae4a541d8cd1bb
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri May 10 14:32:32 2013 +0100

    Fix library way detection; fixes the ImpSafeOnly* tests when BINDIST=YES
    
    We were checking paths with
        if [ -f '"/path/to/Prelude"' ]
    i.e. the " quotes were being quoted by the ' quotes. Now we just
    use " quotes (which come from the ghc-pkg output).

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

 mk/test.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/test.mk b/mk/test.mk
index ee6dd0a..b43195e 100644
--- a/mk/test.mk
+++ b/mk/test.mk
@@ -48,9 +48,9 @@ RUNTEST_OPTS += -e ghc_with_native_codegen=0
 endif
 
 BASE_LIBDIR := $(shell "$(GHC_PKG)" field base library-dirs --simple-output)
-HAVE_VANILLA := $(shell if [ -f '$(subst \,/,$(BASE_LIBDIR))/Prelude.hi' ]; then echo YES; else echo NO; fi)
-HAVE_DYNAMIC := $(shell if [ -f '$(subst \,/,$(BASE_LIBDIR))/Prelude.dyn_hi' ]; then echo YES; else echo NO; fi)
-HAVE_PROFILING := $(shell if [ -f '$(subst \,/,$(BASE_LIBDIR))/Prelude.p_hi' ]; then echo YES; else echo NO; fi)
+HAVE_VANILLA := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.hi ]; then echo YES; else echo NO; fi)
+HAVE_DYNAMIC := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.dyn_hi ]; then echo YES; else echo NO; fi)
+HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(BASE_LIBDIR))/Prelude.p_hi ]; then echo YES; else echo NO; fi)
 
 ifeq "$(HAVE_VANILLA)" "YES"
 RUNTEST_OPTS += -e ghc_with_vanilla=1





More information about the ghc-commits mailing list