[commit: ghc] master: Fix tests when run in parallel (dd3837a)

[git at git.haskell.org]

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

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

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

commit dd3837aba04ff1549217dcf5db8adc3625f175ae
Author: Simon Marlow <smarlow at fb.com>
Date:   Thu Dec 17 01:37:23 2015 -0800

    Fix tests when run in parallel


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

dd3837aba04ff1549217dcf5db8adc3625f175ae
 testsuite/tests/ghc-api/annotations-literals/Makefile  | 4 ++--
 testsuite/tests/ghc-api/annotations-literals/all.T     | 6 ++++--
 testsuite/tests/ghc-api/annotations-literals/parsed.hs | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/ghc-api/annotations-literals/Makefile b/testsuite/tests/ghc-api/annotations-literals/Makefile
index 5b06030..58b50e8 100644
--- a/testsuite/tests/ghc-api/annotations-literals/Makefile
+++ b/testsuite/tests/ghc-api/annotations-literals/Makefile
@@ -6,12 +6,12 @@ clean:
 	rm -f *.o *.hi
 
 literals:
-	rm -f literals.o literals.hi
+	rm -f literals.o literals.hi LiteralsTest.o LiteralsTest.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc literals
 	./literals "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
 
 parsed:
-	rm -f parsed.o parsed.hi
+	rm -f parsed.o parsed.hi LiteralsTest2.o LiteralsTest2.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc parsed
 	./parsed "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
 
diff --git a/testsuite/tests/ghc-api/annotations-literals/all.T b/testsuite/tests/ghc-api/annotations-literals/all.T
index 999c5a4..bef7049 100644
--- a/testsuite/tests/ghc-api/annotations-literals/all.T
+++ b/testsuite/tests/ghc-api/annotations-literals/all.T
@@ -1,2 +1,4 @@
-test('literals', normal, run_command, ['$MAKE -s --no-print-directory literals'])
-test('parsed',   normal, run_command, ['$MAKE -s --no-print-directory parsed'])
\ No newline at end of file
+test('literals', extra_clean(['LiteralsTest.o', 'LiteralsTest.hi']),
+                 run_command, ['$MAKE -s --no-print-directory literals'])
+test('parsed',   extra_clean(['LiteralsTest2.o', 'LiteralsTest2.hi']),
+                 run_command, ['$MAKE -s --no-print-directory parsed'])
diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
index 063e6bc..8664fdc 100644
--- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs
+++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
@@ -20,7 +20,7 @@ import Data.Dynamic ( fromDynamic,Dynamic )
 main::IO()
 main = do
         [libdir] <- getArgs
-        testOneFile libdir "LiteralsTest"
+        testOneFile libdir "LiteralsTest2"
 
 testOneFile libdir fileName = do
     p <- runGhc (Just libdir) $ do