Commit 67277e7c authored by Tamar Christina's avatar Tamar Christina Committed by Ben Gamari

testuite: update more windows tests outputs

Test Plan: ./validate

Reviewers: bgamari, simonmar

Subscribers: rwbarton, carter

Differential Revision: https://phabricator.haskell.org/D5362
parent 06a09a5b
......@@ -902,9 +902,10 @@ def do_test(name, way, func, args, files):
stderr = subprocess.STDOUT,
print_output = config.verbose >= 3)
if exit_code != 0:
# If user used expect_broken then don't record failures of pre_cmd
if exit_code != 0 and opts.expect not in ['fail']:
framework_fail(name, way, 'pre_cmd failed: {0}'.format(exit_code))
if_verbose(1, '** pre_cmd was "{0}". Running trace'.format(override_options(opts.pre_cmd)))
if_verbose(1, '** pre_cmd was "{0}".'.format(override_options(opts.pre_cmd)))
result = func(*[name,way] + args)
......
......@@ -12,6 +12,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should fail, GADTs is not enabled
options currently set: none.
base language is: Haskell2010
......@@ -30,6 +35,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should work, GADTs is in force from :set
options currently set: none.
base language is: Haskell2010
......@@ -47,6 +57,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should fail, GADTs is now disabled
base language is: Haskell2010
with the following modifiers:
......@@ -66,5 +81,10 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should fail, GADTs is only enabled at the prompt
C :: T Int
......@@ -13,6 +13,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
~~~~~~~~~~ Testing :set -a
options currently set: none.
base language is: Haskell2010
......
......@@ -12,6 +12,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should fail, GADTs is not enabled
options currently set: none.
base language is: Haskell2010
......@@ -30,6 +35,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should work, GADTs is in force from :set
options currently set: none.
base language is: Haskell2010
......@@ -47,6 +57,11 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should fail, GADTs is now disabled
base language is: Haskell2010
with the following modifiers:
......@@ -66,5 +81,10 @@ other dynamic, non-language, flag settings:
-fimplicit-import-qualified
-fshow-warning-groups
warning settings:
-Wimplicit-kind-vars
-Wmissing-monadfail-instances
-Wsemigroup
-Wnoncanonical-monoid-instances
-Wstar-is-type
Should fail, GADTs is only enabled at the prompt
C :: T Int
......@@ -41,7 +41,8 @@ test('arith018', normal, compile_and_run, [''])
test('arith019', normal, compile_and_run, [''])
test('expfloat', normal, compile_and_run, [''])
test('FloatFnInverses', normal, compile_and_run, [''])
test('FloatFnInverses', [when(opsys('mingw32'), expect_broken(15670))],
compile_and_run, [''])
test('T1603', skip, compile_and_run, [''])
test('T3676', expect_broken(3676), compile_and_run, [''])
......
......@@ -453,6 +453,7 @@ test('nursery-chunks1',
test('keep-cafs-fail',
[ extra_files(['KeepCafsBase.hs', 'KeepCafs1.hs',
'KeepCafs2.hs', 'KeepCafsMain.hs']),
when(opsys('mingw32'), expect_broken (5987)),
filter_stdout_lines('Evaluated a CAF|exit.*'),
ignore_stderr, # on OS X the shell emits an "Abort trap" message to stderr
],
......@@ -462,7 +463,8 @@ test('keep-cafs-fail',
# Test the -fkeep-cafs flag
test('keep-cafs',
[ extra_files(['KeepCafsBase.hs', 'KeepCafs1.hs',
'KeepCafs2.hs', 'KeepCafsMain.hs'])
'KeepCafs2.hs', 'KeepCafsMain.hs']),
when(opsys('mingw32'), expect_broken (5987)),
],
run_command,
['$MAKE -s --no-print-directory KeepCafs'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment