diff options
author | Ian Lynagh <ian@well-typed.com> | 2013-01-25 01:28:17 +0000 |
---|---|---|
committer | Ian Lynagh <ian@well-typed.com> | 2013-01-25 01:28:17 +0000 |
commit | 4a33b6e89e6e8c89cb0b0ed70685ad7b67240744 (patch) | |
tree | 4ae54f60f999858ff6b4649c943fcecc262ce16b | |
parent | 3e70ca7a0865f5cf2e7c3134803a4645423da791 (diff) | |
download | haskell-4a33b6e89e6e8c89cb0b0ed70685ad7b67240744.tar.gz |
Rename some tests to not start with a digit
-rw-r--r-- | testsuite/tests/driver/1372/all.T | 5 | ||||
-rw-r--r-- | testsuite/tests/driver/2499.stderr | 4 | ||||
-rw-r--r-- | testsuite/tests/driver/Makefile | 10 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/Makefile (renamed from testsuite/tests/driver/1372/Makefile) | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/T1372.stderr (renamed from testsuite/tests/driver/1372/1372.stderr) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/all.T | 5 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p1/A1.hs (renamed from testsuite/tests/driver/1372/p1/A1.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p1/A2.hs (renamed from testsuite/tests/driver/1372/p1/A2.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p1/Setup.hs (renamed from testsuite/tests/driver/1372/p1/Setup.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p1/p1.cabal (renamed from testsuite/tests/driver/1372/p1/p1.cabal) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p2/Main.hs (renamed from testsuite/tests/driver/1372/p2/Main.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p2/Setup.hs (renamed from testsuite/tests/driver/1372/p2/Setup.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1372/p2/p2.cabal (renamed from testsuite/tests/driver/1372/p2/p2.cabal) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/B.hs (renamed from testsuite/tests/driver/1959/B.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/C.hs (renamed from testsuite/tests/driver/1959/C.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/D.hs (renamed from testsuite/tests/driver/1959/D.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/E1.hs (renamed from testsuite/tests/driver/1959/E1.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/E2.hs (renamed from testsuite/tests/driver/1959/E2.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/Makefile (renamed from testsuite/tests/driver/1959/Makefile) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/T1959.stdout (renamed from testsuite/tests/driver/1959/1959.stdout) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T1959/test.T (renamed from testsuite/tests/driver/1959/test.T) | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T2464.hs (renamed from testsuite/tests/driver/2464.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T2464.stderr (renamed from testsuite/tests/driver/2464.stderr) | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T2499.hs (renamed from testsuite/tests/driver/2499.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T2499.stderr | 4 | ||||
-rw-r--r-- | testsuite/tests/driver/T2566.stderr (renamed from testsuite/tests/driver/2566.stderr) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T3674.hs (renamed from testsuite/tests/driver/3674.hs) | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T3674_pre.hs (renamed from testsuite/tests/driver/3674_pre.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T437/Makefile (renamed from testsuite/tests/driver/437/Makefile) | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T437/T437.stderr (renamed from testsuite/tests/driver/437/437.stderr) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T437/T437.stdout (renamed from testsuite/tests/driver/437/437.stdout) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T437/Test.hs (renamed from testsuite/tests/driver/437/Test.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T437/Test2.hs (renamed from testsuite/tests/driver/437/Test2.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/T437/all.T (renamed from testsuite/tests/driver/437/all.T) | 4 | ||||
-rw-r--r-- | testsuite/tests/driver/T5313.hs (renamed from testsuite/tests/driver/5313.hs) | 0 | ||||
-rw-r--r-- | testsuite/tests/driver/all.T | 16 |
36 files changed, 29 insertions, 29 deletions
diff --git a/testsuite/tests/driver/1372/all.T b/testsuite/tests/driver/1372/all.T deleted file mode 100644 index cabf3c01f8..0000000000 --- a/testsuite/tests/driver/1372/all.T +++ /dev/null @@ -1,5 +0,0 @@ -test('1372', - clean_cmd('$MAKE -s clean'), - run_command, - ['$MAKE -s --no-print-directory 1372']) - diff --git a/testsuite/tests/driver/2499.stderr b/testsuite/tests/driver/2499.stderr deleted file mode 100644 index 73404befe3..0000000000 --- a/testsuite/tests/driver/2499.stderr +++ /dev/null @@ -1,4 +0,0 @@ - -2499.hs:1:12: unknown flag in {-# OPTIONS_GHC #-} pragma: -package - -2499.hs:1:12: unknown flag in {-# OPTIONS_GHC #-} pragma: blargh diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile index e293772f49..bd24b2e88d 100644 --- a/testsuite/tests/driver/Makefile +++ b/testsuite/tests/driver/Makefile @@ -411,7 +411,7 @@ test200: # ----------------------------------------------------------------------------- -2566:: +T2566:: if "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c foo2566.bar; then false else true; fi .PHONY: mode001 @@ -439,10 +439,10 @@ shared001: # ----------------------------------------------------------------------------- -3674: - $(RM) 3674*.o 3674*.hi 3674_pre - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make 3674_pre.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make 3674.hs +T3674: + $(RM) T3674*.o T3674*.hi T3674_pre + "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make T3674_pre.hs + "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make T3674.hs .PHONY: rtsopts001 rtsopts001: diff --git a/testsuite/tests/driver/1372/Makefile b/testsuite/tests/driver/T1372/Makefile index e0b3873ec6..91ef6d50c7 100644 --- a/testsuite/tests/driver/1372/Makefile +++ b/testsuite/tests/driver/T1372/Makefile @@ -17,7 +17,7 @@ clean: rm -f p1/A.hs rm -f $(LOCAL_PKGCONF) -1372: +T1372: $(MAKE) clean $(MAKE) prep # This should recompile Main.hs, because A in package p1 has changed diff --git a/testsuite/tests/driver/1372/1372.stderr b/testsuite/tests/driver/T1372/T1372.stderr index f06f294dae..f06f294dae 100644 --- a/testsuite/tests/driver/1372/1372.stderr +++ b/testsuite/tests/driver/T1372/T1372.stderr diff --git a/testsuite/tests/driver/T1372/all.T b/testsuite/tests/driver/T1372/all.T new file mode 100644 index 0000000000..352d66b5d8 --- /dev/null +++ b/testsuite/tests/driver/T1372/all.T @@ -0,0 +1,5 @@ +test('T1372', + clean_cmd('$MAKE -s clean'), + run_command, + ['$MAKE -s --no-print-directory T1372']) + diff --git a/testsuite/tests/driver/1372/p1/A1.hs b/testsuite/tests/driver/T1372/p1/A1.hs index 6656b4bdfc..6656b4bdfc 100644 --- a/testsuite/tests/driver/1372/p1/A1.hs +++ b/testsuite/tests/driver/T1372/p1/A1.hs diff --git a/testsuite/tests/driver/1372/p1/A2.hs b/testsuite/tests/driver/T1372/p1/A2.hs index aa0767c452..aa0767c452 100644 --- a/testsuite/tests/driver/1372/p1/A2.hs +++ b/testsuite/tests/driver/T1372/p1/A2.hs diff --git a/testsuite/tests/driver/1372/p1/Setup.hs b/testsuite/tests/driver/T1372/p1/Setup.hs index 6fa548caf7..6fa548caf7 100644 --- a/testsuite/tests/driver/1372/p1/Setup.hs +++ b/testsuite/tests/driver/T1372/p1/Setup.hs diff --git a/testsuite/tests/driver/1372/p1/p1.cabal b/testsuite/tests/driver/T1372/p1/p1.cabal index 66d4f0ec4c..66d4f0ec4c 100644 --- a/testsuite/tests/driver/1372/p1/p1.cabal +++ b/testsuite/tests/driver/T1372/p1/p1.cabal diff --git a/testsuite/tests/driver/1372/p2/Main.hs b/testsuite/tests/driver/T1372/p2/Main.hs index b423120e43..b423120e43 100644 --- a/testsuite/tests/driver/1372/p2/Main.hs +++ b/testsuite/tests/driver/T1372/p2/Main.hs diff --git a/testsuite/tests/driver/1372/p2/Setup.hs b/testsuite/tests/driver/T1372/p2/Setup.hs index 6fa548caf7..6fa548caf7 100644 --- a/testsuite/tests/driver/1372/p2/Setup.hs +++ b/testsuite/tests/driver/T1372/p2/Setup.hs diff --git a/testsuite/tests/driver/1372/p2/p2.cabal b/testsuite/tests/driver/T1372/p2/p2.cabal index 903515e80c..903515e80c 100644 --- a/testsuite/tests/driver/1372/p2/p2.cabal +++ b/testsuite/tests/driver/T1372/p2/p2.cabal diff --git a/testsuite/tests/driver/1959/B.hs b/testsuite/tests/driver/T1959/B.hs index 8523c17bb4..8523c17bb4 100644 --- a/testsuite/tests/driver/1959/B.hs +++ b/testsuite/tests/driver/T1959/B.hs diff --git a/testsuite/tests/driver/1959/C.hs b/testsuite/tests/driver/T1959/C.hs index 9106a32495..9106a32495 100644 --- a/testsuite/tests/driver/1959/C.hs +++ b/testsuite/tests/driver/T1959/C.hs diff --git a/testsuite/tests/driver/1959/D.hs b/testsuite/tests/driver/T1959/D.hs index 8ff5b1397d..8ff5b1397d 100644 --- a/testsuite/tests/driver/1959/D.hs +++ b/testsuite/tests/driver/T1959/D.hs diff --git a/testsuite/tests/driver/1959/E1.hs b/testsuite/tests/driver/T1959/E1.hs index 1efb41b3e4..1efb41b3e4 100644 --- a/testsuite/tests/driver/1959/E1.hs +++ b/testsuite/tests/driver/T1959/E1.hs diff --git a/testsuite/tests/driver/1959/E2.hs b/testsuite/tests/driver/T1959/E2.hs index cb0ca32ad0..cb0ca32ad0 100644 --- a/testsuite/tests/driver/1959/E2.hs +++ b/testsuite/tests/driver/T1959/E2.hs diff --git a/testsuite/tests/driver/1959/Makefile b/testsuite/tests/driver/T1959/Makefile index f7db491d96..f7db491d96 100644 --- a/testsuite/tests/driver/1959/Makefile +++ b/testsuite/tests/driver/T1959/Makefile diff --git a/testsuite/tests/driver/1959/1959.stdout b/testsuite/tests/driver/T1959/T1959.stdout index 3db47397ee..3db47397ee 100644 --- a/testsuite/tests/driver/1959/1959.stdout +++ b/testsuite/tests/driver/T1959/T1959.stdout diff --git a/testsuite/tests/driver/1959/test.T b/testsuite/tests/driver/T1959/test.T index ff9e8f63a4..563206f09b 100644 --- a/testsuite/tests/driver/1959/test.T +++ b/testsuite/tests/driver/T1959/test.T @@ -1,4 +1,4 @@ -test('1959', +test('T1959', extra_clean(['E.hi', 'E.o', 'E.hs', 'prog', 'compile.out', 'B.hi', 'B.o', 'C.hi', 'C.o', 'D.hi', 'D.o']), run_command, diff --git a/testsuite/tests/driver/2464.hs b/testsuite/tests/driver/T2464.hs index 3547c100fb..3547c100fb 100644 --- a/testsuite/tests/driver/2464.hs +++ b/testsuite/tests/driver/T2464.hs diff --git a/testsuite/tests/driver/2464.stderr b/testsuite/tests/driver/T2464.stderr index 31e794e33c..92e5e640c6 100644 --- a/testsuite/tests/driver/2464.stderr +++ b/testsuite/tests/driver/T2464.stderr @@ -1,3 +1,3 @@ -2464.hs:3:16: +T2464.hs:3:16: Warning: -fffi is deprecated: use -XForeignFunctionInterface or pragma {-# LANGUAGE ForeignFunctionInterface #-} instead diff --git a/testsuite/tests/driver/2499.hs b/testsuite/tests/driver/T2499.hs index b4f48879ee..b4f48879ee 100644 --- a/testsuite/tests/driver/2499.hs +++ b/testsuite/tests/driver/T2499.hs diff --git a/testsuite/tests/driver/T2499.stderr b/testsuite/tests/driver/T2499.stderr new file mode 100644 index 0000000000..9a082d34b1 --- /dev/null +++ b/testsuite/tests/driver/T2499.stderr @@ -0,0 +1,4 @@ + +T2499.hs:1:12: unknown flag in {-# OPTIONS_GHC #-} pragma: -package + +T2499.hs:1:12: unknown flag in {-# OPTIONS_GHC #-} pragma: blargh diff --git a/testsuite/tests/driver/2566.stderr b/testsuite/tests/driver/T2566.stderr index 526c76a86a..526c76a86a 100644 --- a/testsuite/tests/driver/2566.stderr +++ b/testsuite/tests/driver/T2566.stderr diff --git a/testsuite/tests/driver/3674.hs b/testsuite/tests/driver/T3674.hs index 2253ca12ce..055b281224 100644 --- a/testsuite/tests/driver/3674.hs +++ b/testsuite/tests/driver/T3674.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -F -pgmF ./3674_pre #-} +{-# OPTIONS -F -pgmF ./T3674_pre #-} module Test3674 where diff --git a/testsuite/tests/driver/3674_pre.hs b/testsuite/tests/driver/T3674_pre.hs index aef9cef9c7..aef9cef9c7 100644 --- a/testsuite/tests/driver/3674_pre.hs +++ b/testsuite/tests/driver/T3674_pre.hs diff --git a/testsuite/tests/driver/437/Makefile b/testsuite/tests/driver/T437/Makefile index 649d462b1e..8c18b1c3c3 100644 --- a/testsuite/tests/driver/437/Makefile +++ b/testsuite/tests/driver/T437/Makefile @@ -15,7 +15,7 @@ clean: # bug #437 -437: clean +T437: clean '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test.main Test.hs '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test2.main Test2.hs ./Test diff --git a/testsuite/tests/driver/437/437.stderr b/testsuite/tests/driver/T437/T437.stderr index e69de29bb2..e69de29bb2 100644 --- a/testsuite/tests/driver/437/437.stderr +++ b/testsuite/tests/driver/T437/T437.stderr diff --git a/testsuite/tests/driver/437/437.stdout b/testsuite/tests/driver/T437/T437.stdout index 7508a5f9e0..7508a5f9e0 100644 --- a/testsuite/tests/driver/437/437.stdout +++ b/testsuite/tests/driver/T437/T437.stdout diff --git a/testsuite/tests/driver/437/Test.hs b/testsuite/tests/driver/T437/Test.hs index 7c58c0524e..7c58c0524e 100644 --- a/testsuite/tests/driver/437/Test.hs +++ b/testsuite/tests/driver/T437/Test.hs diff --git a/testsuite/tests/driver/437/Test2.hs b/testsuite/tests/driver/T437/Test2.hs index d7732c9424..d7732c9424 100644 --- a/testsuite/tests/driver/437/Test2.hs +++ b/testsuite/tests/driver/T437/Test2.hs diff --git a/testsuite/tests/driver/437/all.T b/testsuite/tests/driver/T437/all.T index 34bb7f88b2..2588738941 100644 --- a/testsuite/tests/driver/437/all.T +++ b/testsuite/tests/driver/T437/all.T @@ -1,7 +1,7 @@ # Test for #437, a recompilation bug with '-main-is' -test('437', +test('T437', [ clean_cmd('$MAKE -s clean') ], run_command, - ['$MAKE -s --no-print-directory 437']) + ['$MAKE -s --no-print-directory T437']) diff --git a/testsuite/tests/driver/5313.hs b/testsuite/tests/driver/T5313.hs index 5b73f11adf..5b73f11adf 100644 --- a/testsuite/tests/driver/5313.hs +++ b/testsuite/tests/driver/T5313.hs diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index f60dc4172b..1bf7c7e33d 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -282,15 +282,15 @@ test('driver200', run_command, ['$MAKE -s --no-print-directory test200']) -test('2566', +test('T2566', normalise_fun(normalise_errmsg), run_command, - ['$MAKE -s --no-print-directory 2566']) + ['$MAKE -s --no-print-directory T2566']) test('pragma001', normal, compile, ['']) test('pragma002', normal, compile, ['']) -test('2499', normal, compile_fail, ['']) +test('T2499', normal, compile_fail, ['']) test('mode001', normal, run_command, ['$MAKE -s --no-print-directory mode001']) @@ -311,14 +311,14 @@ test('dynHelloWorld', compile_and_run, ['']) -test('5313', extra_run_opts('"' + config.libdir + '"'), compile_and_run, ['-package ghc']) +test('T5313', extra_run_opts('"' + config.libdir + '"'), compile_and_run, ['-package ghc']) -test('2464', normal, compile, ['']) -test('3674', +test('T2464', normal, compile, ['']) +test('T3674', [ignore_output, - extra_clean(['3674_pre.hi', '3674_pre.o', '3674_pre', '3674_pre.exe'])], + extra_clean(['T3674_pre.hi', 'T3674_pre.o', 'T3674_pre', 'T3674_pre.exe'])], run_command, - ['$MAKE -s --no-print-directory 3674']) + ['$MAKE -s --no-print-directory T3674']) test('rtsopts001', extra_clean(['rtsOpts.hi', 'rtsOpts.o', 'rtsOpts', 'rtsOpts.exe']), |