diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-07 10:09:38 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-09 18:03:38 -0500 |
| commit | f73fbd2dac42b6f9e9c12de0134bce1298763894 (patch) | |
| tree | 97ee3bb08f057385ada281cbe9e27c47c3dd1d90 | |
| parent | 4d523cb142f69e91b0ff2d0f8f98bdded20cba9a (diff) | |
| download | haskell-f73fbd2dac42b6f9e9c12de0134bce1298763894.tar.gz | |
testsuite: Ignore stderr in PartialDownsweep
As described in #17449, PartialDownsweep is currently fragile due to its
dependence on the error messages produced by the C preprocessor. To eliminate
this dependence we simply ignore stderr output, instead relying on the fact
that the test will exit with a non-zero exit code on failure.
Fixes #17449.
| -rw-r--r-- | testsuite/tests/ghc-api/downsweep/PartialDownsweep.darwin.stderr | 16 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/downsweep/PartialDownsweep.stderr | 16 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/downsweep/all.T | 4 |
3 files changed, 1 insertions, 35 deletions
diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.darwin.stderr b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.darwin.stderr deleted file mode 100644 index c9cd0f216d..0000000000 --- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.darwin.stderr +++ /dev/null @@ -1,16 +0,0 @@ -== Parse error in export list -== Parse error in export list with bypass module -== Parse error in import list -== CPP preprocessor error - -B.hs:2:2: #elif without #if - #elif <- cpp error here - ^ -1 error generated. -== CPP preprocessor error with bypass - -B.hs:2:2: #elif without #if - #elif <- cpp error here - ^ -1 error generated. -== Import error diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.stderr b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.stderr deleted file mode 100644 index 14c1b6c19a..0000000000 --- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.stderr +++ /dev/null @@ -1,16 +0,0 @@ -== Parse error in export list -== Parse error in export list with bypass module -== Parse error in import list -== CPP preprocessor error - -B.hs:2:0: error: - error: #elif without #if - #elif <- cpp error here - -== CPP preprocessor error with bypass - -B.hs:2:0: error: - error: #elif without #if - #elif <- cpp error here - -== Import error diff --git a/testsuite/tests/ghc-api/downsweep/all.T b/testsuite/tests/ghc-api/downsweep/all.T index 7882d77334..2265997604 100644 --- a/testsuite/tests/ghc-api/downsweep/all.T +++ b/testsuite/tests/ghc-api/downsweep/all.T @@ -1,8 +1,6 @@ test('PartialDownsweep', [ extra_run_opts('"' + config.libdir + '"') - , when(opsys('darwin'), - use_specs({'stderr' : 'PartialDownsweep.darwin.stderr'}) - ) + , ignore_stderr ], compile_and_run, ['-package ghc']) |