[Git][ghc/ghc][wip/angerman/cross-test-suite] 6 commits: Fix T13350

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/cross-test-suite at Glasgow Haskell Compiler / GHC


Commits:
bfa015bf by Moritz Angermann at 2020-07-14T08:47:46+00:00
Fix T13350

- - - - -
0299dfa1 by Moritz Angermann at 2020-07-14T08:50:16+00:00
Fix T1372

- - - - -
adbc6213 by Moritz Angermann at 2020-07-14T09:18:25+00:00
Drop exec, use identity wrapper

- - - - -
acf51185 by Moritz Angermann at 2020-07-14T09:18:48+00:00
Fix T13168

- - - - -
58c97f5d by Moritz Angermann at 2020-07-14T09:18:58+00:00
Fix T3007

- - - - -
ead8ecc4 by Moritz Angermann at 2020-07-14T09:23:10+00:00
Fix recomp007

- - - - -


7 changed files:

- + testsuite/driver/id
- testsuite/mk/test.mk
- testsuite/tests/driver/T1372/Makefile
- testsuite/tests/driver/T3007/Makefile
- testsuite/tests/driver/recomp007/Makefile
- testsuite/tests/patsyn/should_compile/T13350/Makefile
- testsuite/tests/typecheck/T13168/Makefile


Changes:

=====================================
testsuite/driver/id
=====================================
@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+#
+# This is the identity test-wrapper.  For native tests we do not need to run
+# executables through a wrapper, as we would need for cross compiled binaries.
+# Cross compiled binaries can be evaluated through WINE, qemu-xxx, nodejs, ...
+#
+# Therefore this backup identity test-wrapper is the default for native builds.
+#
+"$@"
\ No newline at end of file


=====================================
testsuite/mk/test.mk
=====================================
@@ -27,8 +27,8 @@ RUNTESTS     = $(TOP)/driver/runtests.py
 COMPILER     = ghc
 CONFIG       = $(TOP)/config/$(COMPILER)
 
-# if no TEST_WRAPPER is set, use exec
-TEST_WRAPPER ?= exec
+# if no TEST_WRAPPER is set, use an identity wrapper.
+TEST_WRAPPER ?= $(TOP_ABS)/driver/id
 export TEST_WRAPPER
 
 # if no STRIP is set, use `strip`


=====================================
testsuite/tests/driver/T1372/Makefile
=====================================
@@ -4,11 +4,11 @@ include $(TOP)/mk/test.mk
 
 LOCAL_PKGCONF=local.package.conf
 
-SETUP='$(TEST_WRAPPER)' '$(PWD)/Setup' -v0
+SETUP='$(TEST_WRAPPER)' './Setup' -v0
 
 clean:
-	rm -f p1/setup p1/Setup.o p1/Setup.hi
-	rm -f p2/setup p2/Setup.o p2/Setup.hi
+	rm -f p1/Setup p1/Setup.o p1/Setup.hi
+	rm -f p2/Setup p2/Setup.o p2/Setup.hi
 	rm -rf p1/dist p2/dist
 	rm -f *.o *.hi
 	rm -f clean.out prep.out


=====================================
testsuite/tests/driver/T3007/Makefile
=====================================
@@ -15,10 +15,10 @@ clean:
 T3007:
 	$(MAKE) -s --no-print-directory clean
 	'$(GHC_PKG)' init package.conf
-	cd A && '$(TEST_HC)' $(TEST_HC_OPTS) --make Setup
+	cd A && '$(TEST_HC)' $(TEST_HC_OPTS) --make Setup -v0
 	cd A && $(SETUP) configure --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-pkg-option=--no-user-package-db --ghc-option=-package-db../package.conf
 	cd A && $(SETUP) build
 	cd A && $(SETUP) register --inplace
-	cd B && '$(TEST_HC)' $(TEST_HC_OPTS) --make Setup
+	cd B && '$(TEST_HC)' $(TEST_HC_OPTS) --make Setup -v0
 	cd B && $(SETUP) configure --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-pkg-option=--no-user-package-db --ghc-option=-package-db../package.conf
 	cd B && $(SETUP) build


=====================================
testsuite/tests/driver/recomp007/Makefile
=====================================
@@ -4,7 +4,7 @@ include $(TOP)/mk/test.mk
 
 LOCAL_PKGCONF=local.package.conf
 
-SETUP='$(TEST_WRAPPER)' ../Setup -v0
+SETUP='$(TEST_WRAPPER)' ../Setup
 
 clean:
 	rm -f Setup$(exeext)


=====================================
testsuite/tests/patsyn/should_compile/T13350/Makefile
=====================================
@@ -4,11 +4,11 @@ include $(TOP)/mk/test.mk
 
 LOCAL_PKGCONF=local.package.conf
 
-SETUP='$(TEST_WRAPPER)' Setup -v0
+SETUP='$(TEST_WRAPPER)' ./Setup -v0
 
 T13350:
 	"$(GHC_PKG)" init $(LOCAL_PKGCONF)
-	cd boolean && "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make Setup.hs
+	cd boolean && "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make Setup.hs -o Setup
 	cd boolean && $(SETUP) configure --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
 	cd boolean && $(SETUP) build
 	cd boolean && $(SETUP) register --inplace


=====================================
testsuite/tests/typecheck/T13168/Makefile
=====================================
@@ -2,7 +2,7 @@ TOP=../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
-SETUP='$(TEST_WRAPPER)' ../Setup -v0
+SETUP='$(TEST_WRAPPER)' $(PWD)/Setup -v0
 CONFIGURE=$(SETUP) configure --with-ghc='$(TEST_HC)' --with-strip='$(STRIP)' --ghc-options='$(TEST_HC_OPTS)' --package-db='$(PWD)/tmp.d' --prefix='$(PWD)/inst'
 
 T13168: clean



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/495da59b1b40e9d216b7ce86f19fd6c35d23d2ce...ead8ecc42e2ddeaf149c0a3812f306eb61cfce63

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/495da59b1b40e9d216b7ce86f19fd6c35d23d2ce...ead8ecc42e2ddeaf149c0a3812f306eb61cfce63
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200714/ba81fb21/attachment-0001.html>