summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-01-24 10:24:42 -0500
committerBen Gamari <ben@smart-cactus.org>2020-02-14 10:16:36 -0500
commit8ef7a15a0c59b4ceff7f6343cabca8497c0eef50 (patch)
tree706fd4b3b007dfdb1235e863c1635fdc4ed76467
parent7b2da0f429f45ad2d945b4b041e1d58477ce7567 (diff)
downloadhaskell-8ef7a15a0c59b4ceff7f6343cabca8497c0eef50.tar.gz
testsuite/T16930: Don't rely on gnu grep specific --include
In BSD grep this flag only affects directory recursion.
-rw-r--r--testsuite/tests/cmm/should_compile/Makefile12
-rw-r--r--testsuite/tests/cmm/should_compile/T16930.stdout12
2 files changed, 12 insertions, 12 deletions
diff --git a/testsuite/tests/cmm/should_compile/Makefile b/testsuite/tests/cmm/should_compile/Makefile
index ac96d11fac..6ee7fae2e0 100644
--- a/testsuite/tests/cmm/should_compile/Makefile
+++ b/testsuite/tests/cmm/should_compile/Makefile
@@ -7,9 +7,9 @@ include $(TOP)/mk/test.mk
T16930:
echo "testing -ddump-cmm-verbose for T16930 ..."
'$(TEST_HC)' $(TEST_HC_OPTS) T16930.hs -fforce-recomp -ddump-cmm-verbose -ddump-to-file
- grep -rl "CAFEnv" . --include=\T16930.*
- grep -rl "Post control-flow optimisations" . --include=\T16930.*
- grep -rl "Post CPS Cmm" . --include=\T16930.*
- grep -rl "after setInfoTableStackMap" . --include=\T16930.*
- grep -rl "Layout Stack" . --include=\T16930.*
- grep -rl "Post switch plan" . --include=\T16930.*
+ grep -rl "CAFEnv" `ls T16930.*`
+ grep -rl "Post control-flow optimisations" `ls T16930.*`
+ grep -rl "Post CPS Cmm" `ls T16930.*`
+ grep -rl "after setInfoTableStackMap" `ls T16930.*`
+ grep -rl "Layout Stack" `ls T16930.*`
+ grep -rl "Post switch plan" `ls T16930.*`
diff --git a/testsuite/tests/cmm/should_compile/T16930.stdout b/testsuite/tests/cmm/should_compile/T16930.stdout
index bbad2da83f..bc33620682 100644
--- a/testsuite/tests/cmm/should_compile/T16930.stdout
+++ b/testsuite/tests/cmm/should_compile/T16930.stdout
@@ -1,9 +1,9 @@
testing -ddump-cmm-verbose for T16930 ...
[1 of 1] Compiling Main ( T16930.hs, T16930.o )
Linking T16930 ...
-./T16930.dump-cmm-caf
-./T16930.dump-cmm-cfg
-./T16930.dump-cmm-cps
-./T16930.dump-cmm-info
-./T16930.dump-cmm-sp
-./T16930.dump-cmm-switch
+T16930.dump-cmm-caf
+T16930.dump-cmm-cfg
+T16930.dump-cmm-cps
+T16930.dump-cmm-info
+T16930.dump-cmm-sp
+T16930.dump-cmm-switch