From 16514f272fb42af6e9c7674a9bd6c9dce369231f Mon Sep 17 00:00:00 2001 From: David Terei Date: Wed, 20 Jul 2011 11:09:03 -0700 Subject: Move tests from tests/ghc-regress/* to just tests/* --- testsuite/tests/ghc-e/should_run/2228.hs | 4 ++++ testsuite/tests/ghc-e/should_run/2228.stdout | 2 ++ testsuite/tests/ghc-e/should_run/2636.hs | 2 ++ testsuite/tests/ghc-e/should_run/2636.stderr | 4 ++++ testsuite/tests/ghc-e/should_run/3890.hs | 9 ++++++++ testsuite/tests/ghc-e/should_run/3890.stdout | 1 + testsuite/tests/ghc-e/should_run/Makefile | 29 ++++++++++++++++++++++++ testsuite/tests/ghc-e/should_run/all.T | 12 ++++++++++ testsuite/tests/ghc-e/should_run/ghc-e002.hs | 3 +++ testsuite/tests/ghc-e/should_run/ghc-e002.stdout | 1 + testsuite/tests/ghc-e/should_run/ghc-e003.stdout | 2 ++ testsuite/tests/ghc-e/should_run/ghc-e004.stdout | 1 + testsuite/tests/ghc-e/should_run/ghc-e005.hs | 13 +++++++++++ testsuite/tests/ghc-e/should_run/ghc-e005.stderr | 1 + testsuite/tests/ghc-e/should_run/ghc-e005.stdout | 3 +++ 15 files changed, 87 insertions(+) create mode 100644 testsuite/tests/ghc-e/should_run/2228.hs create mode 100644 testsuite/tests/ghc-e/should_run/2228.stdout create mode 100644 testsuite/tests/ghc-e/should_run/2636.hs create mode 100644 testsuite/tests/ghc-e/should_run/2636.stderr create mode 100644 testsuite/tests/ghc-e/should_run/3890.hs create mode 100644 testsuite/tests/ghc-e/should_run/3890.stdout create mode 100644 testsuite/tests/ghc-e/should_run/Makefile create mode 100644 testsuite/tests/ghc-e/should_run/all.T create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e002.hs create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e002.stdout create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e003.stdout create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e004.stdout create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e005.hs create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e005.stderr create mode 100644 testsuite/tests/ghc-e/should_run/ghc-e005.stdout (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/2228.hs b/testsuite/tests/ghc-e/should_run/2228.hs new file mode 100644 index 0000000000..0c53c5ae13 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/2228.hs @@ -0,0 +1,4 @@ +import System.IO +main = do + hGetBuffering stdin >>= print + hGetBuffering stdout >>= print diff --git a/testsuite/tests/ghc-e/should_run/2228.stdout b/testsuite/tests/ghc-e/should_run/2228.stdout new file mode 100644 index 0000000000..07576b5a74 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/2228.stdout @@ -0,0 +1,2 @@ +BlockBuffering Nothing +BlockBuffering Nothing diff --git a/testsuite/tests/ghc-e/should_run/2636.hs b/testsuite/tests/ghc-e/should_run/2636.hs new file mode 100644 index 0000000000..9c6694955a --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/2636.hs @@ -0,0 +1,2 @@ +import MissingModule +main = print "main" diff --git a/testsuite/tests/ghc-e/should_run/2636.stderr b/testsuite/tests/ghc-e/should_run/2636.stderr new file mode 100644 index 0000000000..e69b54b36e --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/2636.stderr @@ -0,0 +1,4 @@ + +2636.hs:1:8: + Could not find module `MissingModule' + Use -v to see a list of the files searched for. diff --git a/testsuite/tests/ghc-e/should_run/3890.hs b/testsuite/tests/ghc-e/should_run/3890.hs new file mode 100644 index 0000000000..a72e5c82a0 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/3890.hs @@ -0,0 +1,9 @@ +module Main (main) where + +import System.Exit +import System.IO + +main :: IO () +main = do putStrLn "Q1" + exitFailure + putStrLn "Q2" diff --git a/testsuite/tests/ghc-e/should_run/3890.stdout b/testsuite/tests/ghc-e/should_run/3890.stdout new file mode 100644 index 0000000000..7e6c303ad6 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/3890.stdout @@ -0,0 +1 @@ +Q1 diff --git a/testsuite/tests/ghc-e/should_run/Makefile b/testsuite/tests/ghc-e/should_run/Makefile new file mode 100644 index 0000000000..2a7fd0a7a8 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/Makefile @@ -0,0 +1,29 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +ghc-e001: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "return ()" + +ghc-e002: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" ghc-e002.hs + +ghc-e003: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e 'putStrLn "Foo"' -e 'putStrLn "Bar"' + +ghc-e004: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":m + System.Exit" -e "exitWith (ExitFailure 6)"; echo $$? + +# This is what runghc does: +ghc-e005: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -main-is foo ghc-e005.hs -e ":set prog ghc-e005-prog" -e ":main [\"the\",\"args\"]"; echo $$? + +2228: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2228.hs + +2636: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2636.hs; if [ "$?" != 0 ]; then true; else false; fi + +3890: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 3890.hs | cat + diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T new file mode 100644 index 0000000000..6039a4088b --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -0,0 +1,12 @@ + +setTestOpts(if_compiler_profiled(skip)) + +test('ghc-e001', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e001']) +test('ghc-e002', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e002']) +test('ghc-e003', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e003']) +test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e004']) +test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005']) + +test('2228', req_interp, run_command, ['$MAKE --no-print-directory -s 2228']) +test('2636', req_interp, run_command, ['$MAKE --no-print-directory -s 2636']) +test('3890', req_interp, run_command, ['$MAKE --no-print-directory -s 3890']) diff --git a/testsuite/tests/ghc-e/should_run/ghc-e002.hs b/testsuite/tests/ghc-e/should_run/ghc-e002.hs new file mode 100644 index 0000000000..028b1a0166 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e002.hs @@ -0,0 +1,3 @@ + +main :: IO () +main = putStrLn "This is main" diff --git a/testsuite/tests/ghc-e/should_run/ghc-e002.stdout b/testsuite/tests/ghc-e/should_run/ghc-e002.stdout new file mode 100644 index 0000000000..23e1ebd03b --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e002.stdout @@ -0,0 +1 @@ +This is main diff --git a/testsuite/tests/ghc-e/should_run/ghc-e003.stdout b/testsuite/tests/ghc-e/should_run/ghc-e003.stdout new file mode 100644 index 0000000000..3b71d5be87 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e003.stdout @@ -0,0 +1,2 @@ +Foo +Bar diff --git a/testsuite/tests/ghc-e/should_run/ghc-e004.stdout b/testsuite/tests/ghc-e/should_run/ghc-e004.stdout new file mode 100644 index 0000000000..1e8b314962 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e004.stdout @@ -0,0 +1 @@ +6 diff --git a/testsuite/tests/ghc-e/should_run/ghc-e005.hs b/testsuite/tests/ghc-e/should_run/ghc-e005.hs new file mode 100644 index 0000000000..4899706d77 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e005.hs @@ -0,0 +1,13 @@ + +import System.Environment +import System.IO + +main :: IO () +main = error "main got called" + +foo :: IO () +foo = do putStrLn "This is foo" + getArgs >>= print + hFlush stdout + error "foo" + diff --git a/testsuite/tests/ghc-e/should_run/ghc-e005.stderr b/testsuite/tests/ghc-e/should_run/ghc-e005.stderr new file mode 100644 index 0000000000..34cecca662 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e005.stderr @@ -0,0 +1 @@ +ghc-e005-prog: foo diff --git a/testsuite/tests/ghc-e/should_run/ghc-e005.stdout b/testsuite/tests/ghc-e/should_run/ghc-e005.stdout new file mode 100644 index 0000000000..57cc51465d --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/ghc-e005.stdout @@ -0,0 +1,3 @@ +This is foo +["the","args"] +1 -- cgit v1.2.1 From 7fdd69fc5ab5161487adbc6286811f1dbc96e34b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 5 Oct 2012 02:09:25 +0100 Subject: 2228 is broken on x86_64-unknown-linux (technically, broken if dynamic-by-default is enabled) --- testsuite/tests/ghc-e/should_run/all.T | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T index 6039a4088b..7f01b5bb58 100644 --- a/testsuite/tests/ghc-e/should_run/all.T +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -7,6 +7,9 @@ test('ghc-e003', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0 test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e004']) test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005']) -test('2228', req_interp, run_command, ['$MAKE --no-print-directory -s 2228']) +test('2228', + [req_interp, if_platform('x86_64-unknown-linux', expect_broken(7298))], + run_command, + ['$MAKE --no-print-directory -s 2228']) test('2636', req_interp, run_command, ['$MAKE --no-print-directory -s 2636']) test('3890', req_interp, run_command, ['$MAKE --no-print-directory -s 3890']) -- cgit v1.2.1 From b601aae93e8b2bfa11bd7e24327577893c7342db Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 14 Oct 2012 17:58:17 +0100 Subject: Tweak the 2228 config --- testsuite/tests/ghc-e/should_run/all.T | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T index 7f01b5bb58..60bafdf73a 100644 --- a/testsuite/tests/ghc-e/should_run/all.T +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -8,7 +8,7 @@ test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0 test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005']) test('2228', - [req_interp, if_platform('x86_64-unknown-linux', expect_broken(7298))], + [req_interp, if_ghci_dynamic(expect_broken(7298))], run_command, ['$MAKE --no-print-directory -s 2228']) test('2636', req_interp, run_command, ['$MAKE --no-print-directory -s 2636']) -- cgit v1.2.1 From 657e24b7ef71cd2b15ff293853b343a02baab997 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 16 Jan 2013 16:40:30 +0000 Subject: Add a test for #7299 --- testsuite/tests/ghc-e/should_run/Makefile | 3 +++ testsuite/tests/ghc-e/should_run/all.T | 1 + 2 files changed, 4 insertions(+) (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/Makefile b/testsuite/tests/ghc-e/should_run/Makefile index 2a7fd0a7a8..3596f02625 100644 --- a/testsuite/tests/ghc-e/should_run/Makefile +++ b/testsuite/tests/ghc-e/should_run/Makefile @@ -27,3 +27,6 @@ ghc-e005: 3890: '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 3890.hs | cat +T7299: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "Control.Concurrent.threadDelay (1000 * 1000)" + diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T index 60bafdf73a..e5a252978b 100644 --- a/testsuite/tests/ghc-e/should_run/all.T +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -13,3 +13,4 @@ test('2228', ['$MAKE --no-print-directory -s 2228']) test('2636', req_interp, run_command, ['$MAKE --no-print-directory -s 2636']) test('3890', req_interp, run_command, ['$MAKE --no-print-directory -s 3890']) +test('T7299', req_interp, run_command, ['$MAKE --no-print-directory -s T7299']) -- cgit v1.2.1 From fc4e1946a3e8fdb05f5234a7207335a0416ac0c9 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 25 Jan 2013 15:56:17 +0000 Subject: Rename some numeric tests: nnnn -> Tnnnn --- testsuite/tests/ghc-e/should_run/2228.hs | 4 ---- testsuite/tests/ghc-e/should_run/2228.stdout | 2 -- testsuite/tests/ghc-e/should_run/2636.hs | 2 -- testsuite/tests/ghc-e/should_run/2636.stderr | 4 ---- testsuite/tests/ghc-e/should_run/3890.hs | 9 --------- testsuite/tests/ghc-e/should_run/3890.stdout | 1 - testsuite/tests/ghc-e/should_run/Makefile | 12 ++++++------ testsuite/tests/ghc-e/should_run/T2228.hs | 4 ++++ testsuite/tests/ghc-e/should_run/T2228.stdout | 2 ++ testsuite/tests/ghc-e/should_run/T2636.hs | 2 ++ testsuite/tests/ghc-e/should_run/T2636.stderr | 4 ++++ testsuite/tests/ghc-e/should_run/T3890.hs | 9 +++++++++ testsuite/tests/ghc-e/should_run/T3890.stdout | 1 + testsuite/tests/ghc-e/should_run/all.T | 8 ++++---- 14 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 testsuite/tests/ghc-e/should_run/2228.hs delete mode 100644 testsuite/tests/ghc-e/should_run/2228.stdout delete mode 100644 testsuite/tests/ghc-e/should_run/2636.hs delete mode 100644 testsuite/tests/ghc-e/should_run/2636.stderr delete mode 100644 testsuite/tests/ghc-e/should_run/3890.hs delete mode 100644 testsuite/tests/ghc-e/should_run/3890.stdout create mode 100644 testsuite/tests/ghc-e/should_run/T2228.hs create mode 100644 testsuite/tests/ghc-e/should_run/T2228.stdout create mode 100644 testsuite/tests/ghc-e/should_run/T2636.hs create mode 100644 testsuite/tests/ghc-e/should_run/T2636.stderr create mode 100644 testsuite/tests/ghc-e/should_run/T3890.hs create mode 100644 testsuite/tests/ghc-e/should_run/T3890.stdout (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/2228.hs b/testsuite/tests/ghc-e/should_run/2228.hs deleted file mode 100644 index 0c53c5ae13..0000000000 --- a/testsuite/tests/ghc-e/should_run/2228.hs +++ /dev/null @@ -1,4 +0,0 @@ -import System.IO -main = do - hGetBuffering stdin >>= print - hGetBuffering stdout >>= print diff --git a/testsuite/tests/ghc-e/should_run/2228.stdout b/testsuite/tests/ghc-e/should_run/2228.stdout deleted file mode 100644 index 07576b5a74..0000000000 --- a/testsuite/tests/ghc-e/should_run/2228.stdout +++ /dev/null @@ -1,2 +0,0 @@ -BlockBuffering Nothing -BlockBuffering Nothing diff --git a/testsuite/tests/ghc-e/should_run/2636.hs b/testsuite/tests/ghc-e/should_run/2636.hs deleted file mode 100644 index 9c6694955a..0000000000 --- a/testsuite/tests/ghc-e/should_run/2636.hs +++ /dev/null @@ -1,2 +0,0 @@ -import MissingModule -main = print "main" diff --git a/testsuite/tests/ghc-e/should_run/2636.stderr b/testsuite/tests/ghc-e/should_run/2636.stderr deleted file mode 100644 index e69b54b36e..0000000000 --- a/testsuite/tests/ghc-e/should_run/2636.stderr +++ /dev/null @@ -1,4 +0,0 @@ - -2636.hs:1:8: - Could not find module `MissingModule' - Use -v to see a list of the files searched for. diff --git a/testsuite/tests/ghc-e/should_run/3890.hs b/testsuite/tests/ghc-e/should_run/3890.hs deleted file mode 100644 index a72e5c82a0..0000000000 --- a/testsuite/tests/ghc-e/should_run/3890.hs +++ /dev/null @@ -1,9 +0,0 @@ -module Main (main) where - -import System.Exit -import System.IO - -main :: IO () -main = do putStrLn "Q1" - exitFailure - putStrLn "Q2" diff --git a/testsuite/tests/ghc-e/should_run/3890.stdout b/testsuite/tests/ghc-e/should_run/3890.stdout deleted file mode 100644 index 7e6c303ad6..0000000000 --- a/testsuite/tests/ghc-e/should_run/3890.stdout +++ /dev/null @@ -1 +0,0 @@ -Q1 diff --git a/testsuite/tests/ghc-e/should_run/Makefile b/testsuite/tests/ghc-e/should_run/Makefile index 3596f02625..1971004d4c 100644 --- a/testsuite/tests/ghc-e/should_run/Makefile +++ b/testsuite/tests/ghc-e/should_run/Makefile @@ -18,14 +18,14 @@ ghc-e004: ghc-e005: '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -main-is foo ghc-e005.hs -e ":set prog ghc-e005-prog" -e ":main [\"the\",\"args\"]"; echo $$? -2228: - '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2228.hs +T2228: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" T2228.hs -2636: - '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2636.hs; if [ "$?" != 0 ]; then true; else false; fi +T2636: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" T2636.hs; if [ "$?" != 0 ]; then true; else false; fi -3890: - '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 3890.hs | cat +T3890: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" T3890.hs | cat T7299: '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "Control.Concurrent.threadDelay (1000 * 1000)" diff --git a/testsuite/tests/ghc-e/should_run/T2228.hs b/testsuite/tests/ghc-e/should_run/T2228.hs new file mode 100644 index 0000000000..0c53c5ae13 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/T2228.hs @@ -0,0 +1,4 @@ +import System.IO +main = do + hGetBuffering stdin >>= print + hGetBuffering stdout >>= print diff --git a/testsuite/tests/ghc-e/should_run/T2228.stdout b/testsuite/tests/ghc-e/should_run/T2228.stdout new file mode 100644 index 0000000000..07576b5a74 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/T2228.stdout @@ -0,0 +1,2 @@ +BlockBuffering Nothing +BlockBuffering Nothing diff --git a/testsuite/tests/ghc-e/should_run/T2636.hs b/testsuite/tests/ghc-e/should_run/T2636.hs new file mode 100644 index 0000000000..9c6694955a --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/T2636.hs @@ -0,0 +1,2 @@ +import MissingModule +main = print "main" diff --git a/testsuite/tests/ghc-e/should_run/T2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr new file mode 100644 index 0000000000..369890fa2e --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/T2636.stderr @@ -0,0 +1,4 @@ + +T2636.hs:1:8: + Could not find module `MissingModule' + Use -v to see a list of the files searched for. diff --git a/testsuite/tests/ghc-e/should_run/T3890.hs b/testsuite/tests/ghc-e/should_run/T3890.hs new file mode 100644 index 0000000000..a72e5c82a0 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/T3890.hs @@ -0,0 +1,9 @@ +module Main (main) where + +import System.Exit +import System.IO + +main :: IO () +main = do putStrLn "Q1" + exitFailure + putStrLn "Q2" diff --git a/testsuite/tests/ghc-e/should_run/T3890.stdout b/testsuite/tests/ghc-e/should_run/T3890.stdout new file mode 100644 index 0000000000..7e6c303ad6 --- /dev/null +++ b/testsuite/tests/ghc-e/should_run/T3890.stdout @@ -0,0 +1 @@ +Q1 diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T index e5a252978b..da14b703c2 100644 --- a/testsuite/tests/ghc-e/should_run/all.T +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -7,10 +7,10 @@ test('ghc-e003', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0 test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e004']) test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005']) -test('2228', +test('T2228', [req_interp, if_ghci_dynamic(expect_broken(7298))], run_command, - ['$MAKE --no-print-directory -s 2228']) -test('2636', req_interp, run_command, ['$MAKE --no-print-directory -s 2636']) -test('3890', req_interp, run_command, ['$MAKE --no-print-directory -s 3890']) + ['$MAKE --no-print-directory -s T2228']) +test('T2636', req_interp, run_command, ['$MAKE --no-print-directory -s T2636']) +test('T3890', req_interp, run_command, ['$MAKE --no-print-directory -s T3890']) test('T7299', req_interp, run_command, ['$MAKE --no-print-directory -s T7299']) -- cgit v1.2.1 From 8d34b5c785c56d68765e70e74e73be45be419df8 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 11 Feb 2013 15:07:12 +0000 Subject: Convert more helper functions --- testsuite/tests/ghc-e/should_run/all.T | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T index da14b703c2..4ab7567358 100644 --- a/testsuite/tests/ghc-e/should_run/all.T +++ b/testsuite/tests/ghc-e/should_run/all.T @@ -1,5 +1,5 @@ -setTestOpts(if_compiler_profiled(skip)) +setTestOpts(when(compiler_profiled(), skip)) test('ghc-e001', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e001']) test('ghc-e002', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e002']) @@ -8,7 +8,7 @@ test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0 test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005']) test('T2228', - [req_interp, if_ghci_dynamic(expect_broken(7298))], + [req_interp, when(ghci_dynamic(), expect_broken(7298))], run_command, ['$MAKE --no-print-directory -s T2228']) test('T2636', req_interp, run_command, ['$MAKE --no-print-directory -s T2636']) -- cgit v1.2.1 From d6588276e819f088e29a6c16ba0a0c82acfd05cc Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 24 Feb 2013 14:48:43 +0000 Subject: Update outputs following the unicode quote change in GHC's output --- testsuite/tests/ghc-e/should_run/T2636.stderr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_run/T2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr index 369890fa2e..dbe70becec 100644 --- a/testsuite/tests/ghc-e/should_run/T2636.stderr +++ b/testsuite/tests/ghc-e/should_run/T2636.stderr @@ -1,4 +1,4 @@ T2636.hs:1:8: - Could not find module `MissingModule' + Could not find module ‛MissingModule’ Use -v to see a list of the files searched for. -- cgit v1.2.1 From f783a6fc54cf6e837c40273884a2f5339bd504a4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 4 Dec 2013 22:33:19 -0600 Subject: Add new ghc-e/should_fail test suite Also add a basic test for #7962. Signed-off-by: Austin Seipp --- testsuite/tests/ghc-e/should_fail/Makefile | 6 ++++++ testsuite/tests/ghc-e/should_fail/all.T | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 testsuite/tests/ghc-e/should_fail/Makefile create mode 100644 testsuite/tests/ghc-e/should_fail/all.T (limited to 'testsuite/tests/ghc-e') diff --git a/testsuite/tests/ghc-e/should_fail/Makefile b/testsuite/tests/ghc-e/should_fail/Makefile new file mode 100644 index 0000000000..5b0d753817 --- /dev/null +++ b/testsuite/tests/ghc-e/should_fail/Makefile @@ -0,0 +1,6 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +T7962: + '$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "return (" diff --git a/testsuite/tests/ghc-e/should_fail/all.T b/testsuite/tests/ghc-e/should_fail/all.T new file mode 100644 index 0000000000..4c5ac5cebd --- /dev/null +++ b/testsuite/tests/ghc-e/should_fail/all.T @@ -0,0 +1,3 @@ +setTestOpts(when(compiler_profiled(), skip)) + +test('T7962', [exit_code(2), req_interp, ignore_output], run_command, ['$MAKE --no-print-directory -s T7962']) -- cgit v1.2.1