[commit: ghc] wip/7.10-api-annots: Fix failing API Annotations tests from master cherry pick (3aca63a)

[git at git.haskell.org]

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

On branch  : wip/7.10-api-annots
Link       : http://ghc.haskell.org/trac/ghc/changeset/3aca63a3e31078246c111fbf385cf0fb84e5ff04/ghc

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

commit 3aca63a3e31078246c111fbf385cf0fb84e5ff04
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri May 8 19:01:43 2015 +0200

    Fix failing API Annotations tests from master cherry pick


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

3aca63a3e31078246c111fbf385cf0fb84e5ff04
 testsuite/tests/ghc-api/annotations/T10268.stderr | 9 ++++++++-
 testsuite/tests/ghc-api/annotations/T10312.stderr | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/testsuite/tests/ghc-api/annotations/T10268.stderr b/testsuite/tests/ghc-api/annotations/T10268.stderr
index de983a2..0fe0427 100644
--- a/testsuite/tests/ghc-api/annotations/T10268.stderr
+++ b/testsuite/tests/ghc-api/annotations/T10268.stderr
@@ -1,7 +1,14 @@
 
 Test10268.hs:5:6:
     Not in scope: ‘footemplate’
-    In the untyped splice: $footemplate
+    In the splice: $footemplate
+
+Test10268.hs:5:6:
+    GHC stage restriction:
+      ‘footemplate’ is used in a top-level splice or annotation,
+      and must be imported, not defined locally
+    In the expression: footemplate
+    In the splice: $footemplate
 
 Test10268.hs:7:14:
     Not in scope: type constructor or class ‘Pattern’
diff --git a/testsuite/tests/ghc-api/annotations/T10312.stderr b/testsuite/tests/ghc-api/annotations/T10312.stderr
index 08f3bec..939823c 100644
--- a/testsuite/tests/ghc-api/annotations/T10312.stderr
+++ b/testsuite/tests/ghc-api/annotations/T10312.stderr
@@ -1,8 +1,8 @@
 
-Test10312.hs:77:38: error: Not in scope: data constructor ‘Fixity’
+Test10312.hs:77:38: Not in scope: data constructor ‘Fixity’
 
-Test10312.hs:77:53: error:
+Test10312.hs:77:53:
     Not in scope: ‘fs’
     Perhaps you meant ‘fst’ (imported from Prelude)
 
-Test10312.hs:78:47: error: Not in scope: ‘ppDir’
+Test10312.hs:78:47: Not in scope: ‘ppDir’