diff options
author | Ian Lynagh <igloo@earth.li> | 2010-01-03 13:11:27 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2010-01-03 13:11:27 +0000 |
commit | c3d89796528a403292450e9677ce80b19b0d24ae (patch) | |
tree | 2288a385a287f114bb7480e26614494986075967 /testsuite/mk | |
parent | 511dd7d9c7418f01a5dbbfef3c5d3ceac3db4dae (diff) | |
download | haskell-c3d89796528a403292450e9677ce80b19b0d24ae.tar.gz |
Use "test -x" rather than "test -e"; fixes trac #3778
Solaris doesn't support -e
Diffstat (limited to 'testsuite/mk')
-rw-r--r-- | testsuite/mk/boilerplate.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index d057281dcd..d17c0b1e41 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -25,7 +25,7 @@ endef define canonicaliseExecutable # $1 = program path variable -ifneq "$$(shell test -e '$$($1).exe' && echo exists)" "" +ifneq "$$(shell test -x '$$($1).exe' && echo exists)" "" $1 := $$($1).exe endif $(call canonicalise,$1) @@ -99,27 +99,27 @@ HPC := $(BIN_ROOT)/hpc endif $(eval $(call canonicaliseExecutable,TEST_HC)) -ifeq "$(shell test -e '$(TEST_HC)' && echo exists)" "" +ifeq "$(shell test -x '$(TEST_HC)' && echo exists)" "" $(error Cannot find ghc: $(TEST_HC)) endif $(eval $(call canonicaliseExecutable,GHC_PKG)) -ifeq "$(shell test -e '$(GHC_PKG)' && echo exists)" "" +ifeq "$(shell test -x '$(GHC_PKG)' && echo exists)" "" $(error Cannot find ghc-pkg: $(GHC_PKG)) endif $(eval $(call canonicaliseExecutable,HSC2HS)) -ifeq "$(shell test -e '$(HSC2HS)' && echo exists)" "" +ifeq "$(shell test -x '$(HSC2HS)' && echo exists)" "" $(error Cannot find hsc2hs: $(HSC2HS)) endif $(eval $(call canonicaliseExecutable,HP2PS_ABS)) -ifeq "$(shell test -e '$(HP2PS_ABS)' && echo exists)" "" +ifeq "$(shell test -x '$(HP2PS_ABS)' && echo exists)" "" $(error Cannot find hp2ps: $(HP2PS_ABS)) endif $(eval $(call canonicaliseExecutable,HPC)) -ifeq "$(shell test -e '$(HPC)' && echo exists)" "" +ifeq "$(shell test -x '$(HPC)' && echo exists)" "" $(error Cannot find hpc: $(HPC)) endif |