[commit: ghc] master: Fix up test results. (e12ebf8)

[git at git.haskell.org]

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

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

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

commit e12ebf88c49a2ae53256cea38aa0320977d52d92
Author: David Feuer <david.feuer at gmail.com>
Date:   Thu Mar 2 16:30:33 2017 -0500

    Fix up test results.
    
    Set up test results and Makefile as SPJ intended (I believe).
    Previous changes accidentally did something a bit different.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D3248


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

e12ebf88c49a2ae53256cea38aa0320977d52d92
 testsuite/tests/simplCore/should_compile/Makefile      | 7 ++++---
 testsuite/tests/simplCore/should_compile/T13156.stdout | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index 51aeaa1..4930c68 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -28,8 +28,9 @@ T8832:
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl T8832.hs | grep '^[a-zA-Z0-9]\+ ='
 
 T12603:
-	$(RM) -f T8832.o T8832.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques T12603.hs | grep 'wf1'
+	$(RM) -f T12603.o T12603.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques T12603.hs | grep 'GHC.Real'
+         # Horribly delicate; looking for a top-level shared call to 2^8
 
 T11155:
 	$(RM) -f T11155.o T11155.hi
@@ -129,7 +130,7 @@ T13155:
 
 T13156:
 	$(RM) -f T13156.hi T13156.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T13156.hs -O -ddump-prep -dsuppress-uniques | grep "case"
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T13156.hs -O -ddump-prep -dsuppress-uniques | grep "case.*Any"
         # There should be a single 'case r @ GHC.Types.Any'
 
 .PHONY: T4138
diff --git a/testsuite/tests/simplCore/should_compile/T13156.stdout b/testsuite/tests/simplCore/should_compile/T13156.stdout
index 765c5e1..265d07b 100644
--- a/testsuite/tests/simplCore/should_compile/T13156.stdout
+++ b/testsuite/tests/simplCore/should_compile/T13156.stdout
@@ -1,4 +1 @@
-      case GHC.List.reverse @ a x of sat { __DEFAULT ->
-      case \ (@ a1) ->
-             case g x of {
       case r @ GHC.Types.Any of { __DEFAULT -> r @ a }