[commit: ghc] master: CSE should deal with letrec (#9441) (a08b285)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a08b285f74cd49196feb0f819d70ad0508689da3/ghc

>---------------------------------------------------------------

commit a08b285f74cd49196feb0f819d70ad0508689da3
Author: roland <rsx at bluewin.ch>
Date:   Sat Aug 18 23:45:31 2018 +0200

    CSE should deal with letrec (#9441)
    
    Summary: Write tests with fewer lines. See comments of nomeata in
    https://phabricator.haskell.org/D5038.
    
    Test Plan: make test TESTS='T9441a T9441b T9441c'
    
    Reviewers: nomeata, dfeuer, bgamari
    
    Reviewed By: nomeata
    
    Subscribers: rwbarton, carter
    
    GHC Trac Issues: #9441
    
    Differential Revision: https://phabricator.haskell.org/D5076


>---------------------------------------------------------------

a08b285f74cd49196feb0f819d70ad0508689da3
 testsuite/tests/simplCore/should_compile/Makefile           | 13 -------------
 .../should_compile/{T9441a.stdout => T9441a.stderr}         |  0
 .../should_compile/{T9441b.stdout => T9441b.stderr}         |  0
 .../should_compile/{T9441c.stdout => T9441c.stderr}         |  0
 testsuite/tests/simplCore/should_compile/all.T              |  6 +++---
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index 0fb5dc2..1233b8c 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -27,19 +27,6 @@ T8848:
 	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-rule-firings T8848.hs | grep 'SPEC map2'
         # Should fire twice
 
-T9441a:
-	$(RM) -f T9941a.o T9941a.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-all T9441a.hs | grep 'f1 = f2'
-	    # Grep output should show 'f1 = f2'
-T9441b:
-	$(RM) -f T9941b.o T9941b.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-all T9441b.hs | grep 'Rec {'
-	    # Grep output should show only one recursive Bind 'Rec {'
-T9441c:
-	$(RM) -f T9941c.o T9941c.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-all T9441c.hs | grep 'Rec {'
-	    # Grep output should show only one recursive Bind 'Rec {'
-
 T9509:
 	$(RM) -f T9509*.o T9509*.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T9509a.hs
diff --git a/testsuite/tests/simplCore/should_compile/T9441a.stdout b/testsuite/tests/simplCore/should_compile/T9441a.stderr
similarity index 100%
rename from testsuite/tests/simplCore/should_compile/T9441a.stdout
rename to testsuite/tests/simplCore/should_compile/T9441a.stderr
diff --git a/testsuite/tests/simplCore/should_compile/T9441b.stdout b/testsuite/tests/simplCore/should_compile/T9441b.stderr
similarity index 100%
rename from testsuite/tests/simplCore/should_compile/T9441b.stdout
rename to testsuite/tests/simplCore/should_compile/T9441b.stderr
diff --git a/testsuite/tests/simplCore/should_compile/T9441c.stdout b/testsuite/tests/simplCore/should_compile/T9441c.stderr
similarity index 100%
rename from testsuite/tests/simplCore/should_compile/T9441c.stdout
rename to testsuite/tests/simplCore/should_compile/T9441c.stderr
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 07b5f0a..595607b 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -196,9 +196,9 @@ test('T8848a', only_ways(['optasm']), compile, ['-ddump-rules'])
 test('T8331', only_ways(['optasm']), compile, ['-ddump-rules'])
 test('T6056', only_ways(['optasm']), multimod_compile, ['T6056', '-v0 -ddump-rule-firings'])
 test('T9400', only_ways(['optasm']), compile, ['-O0 -ddump-simpl -dsuppress-uniques'])
-test('T9441a', normal, run_command, ['$MAKE -s --no-print-directory T9441a'])
-test('T9441b', normal, run_command, ['$MAKE -s --no-print-directory T9441b'])
-test('T9441c', normal, run_command, ['$MAKE -s --no-print-directory T9441c'])
+test('T9441a', [only_ways(['optasm']), check_errmsg(r'f1 = f2') ], compile, ['-ddump-simpl'])
+test('T9441b', [only_ways(['optasm']), check_errmsg(r'Rec {') ], compile, ['-ddump-simpl'])
+test('T9441c', [only_ways(['optasm']), check_errmsg(r'Rec {') ], compile, ['-ddump-simpl'])
 test('T9583', only_ways(['optasm']), compile, [''])
 test('T9565', only_ways(['optasm']), compile, [''])
 test('T5821', only_ways(['optasm']), compile, [''])