[commit: ghc] master: testsuite: Fix T13025 (88f5add)
git at git.haskell.org
git at git.haskell.org
Tue Dec 27 17:45:05 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/88f5add0280788d424c9df5f751a73e73a1a4284/ghc
>---------------------------------------------------------------
commit 88f5add0280788d424c9df5f751a73e73a1a4284
Author: Ben Gamari <ben at smart-cactus.org>
Date: Tue Dec 27 12:08:24 2016 -0500
testsuite: Fix T13025
It relied on `wc`, which produces slightly different format on OS X and Linux.
Instead use `grep -c` which appears to be supported on both platforms and
produces consistent output.
>---------------------------------------------------------------
88f5add0280788d424c9df5f751a73e73a1a4284
testsuite/tests/simplCore/should_compile/Makefile | 2 +-
testsuite/tests/simplCore/should_compile/T13025.stdout | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index 2efb8bd..7d5d5b9 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -174,5 +174,5 @@ T12877:
T13025:
$(RM) -f T13025.o T13025.hi T13025a.o T13025a.hi
'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13025a.hs
- '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13025.hs -ddump-simpl | grep HEq_sc | wc
+ -'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13025.hs -ddump-simpl | grep -c HEq_sc
# No lines should match 'HEq_sc' so wc should output zeros
diff --git a/testsuite/tests/simplCore/should_compile/T13025.stdout b/testsuite/tests/simplCore/should_compile/T13025.stdout
index 7d1413f..573541a 100644
--- a/testsuite/tests/simplCore/should_compile/T13025.stdout
+++ b/testsuite/tests/simplCore/should_compile/T13025.stdout
@@ -1 +1 @@
- 0 0 0
+0
More information about the ghc-commits
mailing list