[commit: ghc] master: testuite: update more windows tests outputs (67277e7)

Thu Nov 22 18:44:04 UTC 2018

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/67277e7c783dac1fb66d1b113a8b1f2be784b24b/ghc

>---------------------------------------------------------------

commit 67277e7c783dac1fb66d1b113a8b1f2be784b24b
Author: Tamar Christina <tamar at zhox.com>
Date:   Thu Nov 22 11:43:37 2018 -0500

    testuite: update more windows tests outputs
    
    Test Plan: ./validate
    
    Reviewers: bgamari, simonmar
    
    Subscribers: rwbarton, carter
    
    Differential Revision: https://phabricator.haskell.org/D5362


>---------------------------------------------------------------

67277e7c783dac1fb66d1b113a8b1f2be784b24b
 testsuite/driver/testlib.py                         |  5 +++--
 testsuite/tests/ghci/scripts/T9293.stdout-mingw32   | 20 ++++++++++++++++++++
 testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 |  5 +++++
 testsuite/tests/ghci/scripts/ghci057.stdout-mingw32 | 20 ++++++++++++++++++++
 testsuite/tests/numeric/should_run/all.T            |  3 ++-
 testsuite/tests/rts/all.T                           |  4 +++-
 6 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index b2f14d1..94211df 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -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)
 
diff --git a/testsuite/tests/ghci/scripts/T9293.stdout-mingw32 b/testsuite/tests/ghci/scripts/T9293.stdout-mingw32
index c5be11a..be028c5 100644
--- a/testsuite/tests/ghci/scripts/T9293.stdout-mingw32
+++ b/testsuite/tests/ghci/scripts/T9293.stdout-mingw32
@@ -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
diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 b/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
index 1247616..b0f4c73 100644
--- a/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
+++ b/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
@@ -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
diff --git a/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32 b/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32
index c5be11a..be028c5 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32
+++ b/testsuite/tests/ghci/scripts/ghci057.stdout-mingw32
@@ -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
diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index 140fa6c..295e818 100644
--- a/testsuite/tests/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
@@ -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, [''])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 8d2f37b..e42d970 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -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'])

