testsuite: Really fix #16741
authorBen Gamari <ben@smart-cactus.org>
Fri, 14 Jun 2019 02:51:53 +0000 (22:51 -0400)
committerMarge Bot <ben+marge-bot@smart-cactus.org>
Sun, 16 Jun 2019 23:38:51 +0000 (19:38 -0400)
The previous fix, !1095, didn't work as `--show-iface` ignores
`-dsuppress-ticks`. Rework the test instead.

testsuite/tests/simplCore/should_compile/Makefile
testsuite/tests/simplCore/should_compile/T4918.stdout

index 93388c4..4b71bf3 100644 (file)
@@ -111,8 +111,7 @@ T4903:
 T4918:
        $(RM) -f T4918.hi T4918.o T4918a.hi T4918a.o
        '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918a.hs
-       '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918.hs
-       '$(TEST_HC)' $(TEST_HC_OPTS) -dsuppress-ticks --show-iface T4918.hi | grep 'C#'
+       '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918.hs -ddump-simpl -dsuppress-all 2>&1 | grep 'C#'
 
 EvalTest:
        '$(TEST_HC)' $(TEST_HC_OPTS) -c -O EvalTest.hs -ddump-simpl -dsuppress-uniques | grep 'rght.*Dmd' | sed 's/^ *//'
index 4e957c0..f4aa0d5 100644 (file)
@@ -1,2 +1,3 @@
-  {- HasNoCafRefs, Strictness: m, Unfolding: (GHC.Types.C# 'p'#) -}
-  {- HasNoCafRefs, Strictness: m, Unfolding: (GHC.Types.C# 'q'#) -}
+f4 = C# 'p'#
+f5 = C# 'q'#
+