[Git][ghc/ghc][wip/angerman/cross-test-suite] 2 commits: use $*

[Moritz Angermann]

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


Commits:
cfe0671f by Moritz Angermann at 2020-07-14T12:58:48+00:00
use $*

- - - - -
c4b83631 by Moritz Angermann at 2020-07-14T12:59:11+00:00
fix concio001

- - - - -


2 changed files:

- libraries/base/tests/IO/Makefile
- testsuite/driver/id


Changes:

=====================================
libraries/base/tests/IO/Makefile
=====================================
@@ -6,13 +6,14 @@ TOP=../../../../testsuite
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
+# NB. sleep for 3s. When we use TEST_WRAPPERs they might have a delay to come up.
 test.concio001:
 	"$(TEST_HC)" $(TEST_HC_OPTS) --make -fforce-recomp -v0 concio001 -o concio001
-	(sleep 1; echo x) | '$(TEST_WRAPPER)' ./concio001
+	(sleep 3; echo x) | '$(TEST_WRAPPER)' ./concio001
 
 test.concio001.thr:
 	"$(TEST_HC)" $(TEST_HC_OPTS) --make -fforce-recomp -v0 -threaded concio001 -o concio001
-	(sleep 1; echo x) | '$(TEST_WRAPPER)' ./concio001
+	(sleep 3; echo x) | '$(TEST_WRAPPER)' ./concio001
 
 # NB. utf8-test should *not* have a final newline.  The last char should be 'X'.
 utf16-test: utf8-test


=====================================
testsuite/driver/id
=====================================
@@ -6,4 +6,4 @@
 #
 # Therefore this backup identity test-wrapper is the default for native builds.
 #
-"$@"
\ No newline at end of file
+"$*"
\ No newline at end of file



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ead8ecc42e2ddeaf149c0a3812f306eb61cfce63...c4b836312a39b6416b5c8057149f2b170d24be91
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/19abbb5c/attachment-0001.html>