diff options
author | Austin Seipp <austin@well-typed.com> | 2015-05-19 07:28:00 -0500 |
---|---|---|
committer | Austin Seipp <austin@well-typed.com> | 2015-05-19 07:28:00 -0500 |
commit | edb8dc5cd2350206fcbe0ab8aa0954b3db50d7ab (patch) | |
tree | ef940042460f4a8493c74928837f1e8bd9dcc8b5 /testsuite/tests/ghc-api | |
parent | fc8c5e7a516803c04f2a38b53b9e8beb2066c056 (diff) | |
download | haskell-edb8dc5cd2350206fcbe0ab8aa0954b3db50d7ab.tar.gz |
Revert "compiler: make sure we reject -O + HscInterpreted" (again)
Apparently my machine likes this commit, but Harbormaster does not?
This reverts commit b199536be25ea046079587933cc73d0a948a0626.
Diffstat (limited to 'testsuite/tests/ghc-api')
-rw-r--r-- | testsuite/tests/ghc-api/T10052/Makefile | 12 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T10052/T10052-input.hs | 1 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T10052/T10052.hs | 30 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T10052/T10052.stderr | 3 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T10052/T10052.stdout | 1 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/T10052/all.T | 2 |
6 files changed, 0 insertions, 49 deletions
diff --git a/testsuite/tests/ghc-api/T10052/Makefile b/testsuite/tests/ghc-api/T10052/Makefile deleted file mode 100644 index a94ec4ed39..0000000000 --- a/testsuite/tests/ghc-api/T10052/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP=../../.. -include $(TOP)/mk/boilerplate.mk -include $(TOP)/mk/test.mk - -clean: - rm -f *.o *.hi - -T10052: clean - '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc T10052 - ./T10052 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" -XScopedTypeVariables -O - -.PHONY: clean T10052 diff --git a/testsuite/tests/ghc-api/T10052/T10052-input.hs b/testsuite/tests/ghc-api/T10052/T10052-input.hs deleted file mode 100644 index 89879a7195..0000000000 --- a/testsuite/tests/ghc-api/T10052/T10052-input.hs +++ /dev/null @@ -1 +0,0 @@ -main = let (x :: String) = "hello" in putStrLn x diff --git a/testsuite/tests/ghc-api/T10052/T10052.hs b/testsuite/tests/ghc-api/T10052/T10052.hs deleted file mode 100644 index c2df4ae983..0000000000 --- a/testsuite/tests/ghc-api/T10052/T10052.hs +++ /dev/null @@ -1,30 +0,0 @@ -{-# LANGUAGE RecordWildCards #-} -{-# OPTIONS_GHC -Wall #-} -module Main where - -import System.Environment -import GHC - -main :: IO () -main = do - flags <- getArgs - runGhc' flags $ do - setTargets [Target (TargetFile "T10052-input.hs" Nothing) True Nothing] - _success <- load LoadAllTargets - return () - -runGhc' :: [String] -> Ghc a -> IO a -runGhc' args act = do - let libdir = head args - flags = tail args - (dynFlags, _warns) <- parseStaticFlags (map noLoc flags) - runGhc (Just libdir) $ do - dflags0 <- getSessionDynFlags - (dflags1, _leftover, _warns) <- parseDynamicFlags dflags0 dynFlags - let dflags2 = dflags1 { - hscTarget = HscInterpreted - , ghcLink = LinkInMemory - , verbosity = 1 - } - _newPkgs <- setSessionDynFlags dflags2 - act diff --git a/testsuite/tests/ghc-api/T10052/T10052.stderr b/testsuite/tests/ghc-api/T10052/T10052.stderr deleted file mode 100644 index d298a59365..0000000000 --- a/testsuite/tests/ghc-api/T10052/T10052.stderr +++ /dev/null @@ -1,3 +0,0 @@ - -<no location info>: Warning: - -O conflicts with --interactive; -O ignored. diff --git a/testsuite/tests/ghc-api/T10052/T10052.stdout b/testsuite/tests/ghc-api/T10052/T10052.stdout deleted file mode 100644 index 1a909eb36f..0000000000 --- a/testsuite/tests/ghc-api/T10052/T10052.stdout +++ /dev/null @@ -1 +0,0 @@ -[1 of 1] Compiling Main ( T10052-input.hs, interpreted ) diff --git a/testsuite/tests/ghc-api/T10052/all.T b/testsuite/tests/ghc-api/T10052/all.T deleted file mode 100644 index bb73f85fa1..0000000000 --- a/testsuite/tests/ghc-api/T10052/all.T +++ /dev/null @@ -1,2 +0,0 @@ -test('T10052', normal, run_command, - ['$MAKE -s --no-print-directory T10052']) |