diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-06-30 23:25:55 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-07-09 08:46:09 -0400 |
| commit | 82284ba19a588516a49905762b0352cb198a3948 (patch) | |
| tree | 7ffb6ca4ed7d76ddea020ec8b39325526b42f34a | |
| parent | 56eb57a6b348d44370fc84f6a35caabd1c548b5e (diff) | |
| download | haskell-82284ba19a588516a49905762b0352cb198a3948.tar.gz | |
Remove reqlib from cgrun025 test
| -rw-r--r-- | testsuite/tests/codeGen/should_run/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/codeGen/should_run/cgrun025.hs | 6 | ||||
| -rw-r--r-- | testsuite/tests/codeGen/should_run/cgrun025.stderr | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T index b744ec97e9..4ea31f9011 100644 --- a/testsuite/tests/codeGen/should_run/all.T +++ b/testsuite/tests/codeGen/should_run/all.T @@ -29,8 +29,8 @@ test('cgrun021', extra_ways(['nursery_chunks']), compile_and_run, ['']) test('cgrun022', normal, compile_and_run, ['']) test('cgrun024', normal, compile_and_run, ['']) test('cgrun025', - [reqlib('regex-compat'), extra_run_opts('cgrun025.hs'), exit_code(1)], - compile_and_run, ['-package regex-compat']) + [ extra_run_opts('cgrun025.hs'), exit_code(1)], + compile_and_run, ['']) test('cgrun026', normal, compile_and_run, ['']) test('cgrun027', normal, compile_and_run, ['']) test('cgrun028', normal, compile_and_run, ['']) diff --git a/testsuite/tests/codeGen/should_run/cgrun025.hs b/testsuite/tests/codeGen/should_run/cgrun025.hs index f9633ee204..39255c147d 100644 --- a/testsuite/tests/codeGen/should_run/cgrun025.hs +++ b/testsuite/tests/codeGen/should_run/cgrun025.hs @@ -6,13 +6,13 @@ import Control.Exception import System.Environment import System.IO import Debug.Trace (trace) -import Text.Regex import Data.Maybe +import Data.List (isInfixOf) main = do prog <- getProgName - let Just (name:_) = matchRegex (mkRegex ".*(cgrun025)") prog - hPutStr stderr (shows name "\n") + let True = "cgrun025" `isInfixOf` prog + hPutStr stderr (shows prog "\n") args <- getArgs hPutStr stderr (shows args "\n") path <- getEnv "PATH" diff --git a/testsuite/tests/codeGen/should_run/cgrun025.stderr b/testsuite/tests/codeGen/should_run/cgrun025.stderr index 2668913b85..35ad64c79c 100644 --- a/testsuite/tests/codeGen/should_run/cgrun025.stderr +++ b/testsuite/tests/codeGen/should_run/cgrun025.stderr @@ -9,13 +9,13 @@ import Control.Exception import System.Environment import System.IO import Debug.Trace (trace) -import Text.Regex import Data.Maybe +import Data.List (isInfixOf) main = do prog <- getProgName - let Just (name:_) = matchRegex (mkRegex ".*(cgrun025)") prog - hPutStr stderr (shows name "\n") + let True = "cgrun025" `isInfixOf` prog + hPutStr stderr (shows prog "\n") args <- getArgs hPutStr stderr (shows args "\n") path <- getEnv "PATH" |