Various testsuite fixes for 32-bit Windows
authorBen Gamari <ben@smart-cactus.org>
Sun, 2 Apr 2017 21:10:48 +0000 (17:10 -0400)
committerBen Gamari <ben@smart-cactus.org>
Mon, 3 Apr 2017 01:13:10 +0000 (21:13 -0400)
testsuite/tests/perf/haddock/all.T
testsuite/tests/perf/should_run/all.T
testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32 [new file with mode: 0644]
testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32 [moved from testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32 with 100% similarity]
testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32 [new file with mode: 0644]
testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-64-mingw32 [moved from testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32 with 100% similarity]
testsuite/tests/rts/T11223/all.T
testsuite/tests/rts/T7037_main.c

index 65e1644..4de07f4 100644 (file)
@@ -40,12 +40,13 @@ test('haddock.base',
             # 2017-02-17: 38425793776 (x86_64/Linux) - Generalize kind of (->)
             # 2017-02-12: 25592972912 (x86_64/Linux) - Type-indexed Typeable
 
-          ,(platform('i386-unknown-mingw32'), 4434804940, 5)
+          ,(platform('i386-unknown-mingw32'), 2885173512, 5)
             # 2013-02-10:                     3358693084 (x86/Windows)
             # 2013-11-13:                     3097751052 (x86/Windows, 64bit machine)
             # 2014-04-04:                     3548581572 (x86/Windows, 64bit machine)
             # 2014-12-01:                     4202377432 (x86/Windows, 64bit machine)
             # 2015-01-20:                     4434804940 (x86/Windows, 64bit machine)
+            # 2017-04-02:                     2885173512 update
 
           ,(wordsize(32), 3819657568, 5)])
             # 2012-08-14: 3046487920 (x86/OSX)
@@ -150,12 +151,13 @@ test('haddock.compiler',
             # 2017-02-11: 62070477608 (amd64/Linux) OccurAnal / One-Shot  (#13227) (and others)
             # 2017-02-25: 55777283352 (amd64/Linux) Early inline patch
 
-          ,(platform('i386-unknown-mingw32'),   902576468, 10)
+          ,(platform('i386-unknown-mingw32'),   367546388, 10)
             # 2012-10-30:                     13773051312 (x86/Windows)
             # 2013-02-10:                     14925262356 (x86/Windows)
             # 2013-11-13:                     14328363592 (x86/Windows, 64bit machine)
             # 2014-12-01:                       104140852 (x86/Windows, sudden shrinkage!)
             # 2014-12-10:                       217933548 increased again
+            # 2017-04-02:                       367546388 update
 
           ,(wordsize(32), 118738876, 5)])
             # 2012-08-14: 13471797488 (x86/OSX)
index 49a6656..0451348 100644 (file)
@@ -111,6 +111,7 @@ test('T876',
           [(platform('x86_64-unknown-mingw32'), 66928, 5),
               # 2015-04-03: 71904 (amd64/Windows, unknown cause)
               # 2016-11-27: 66928 (amd64/Windows, unknown cause)
+
            (wordsize(64), 58128, 5),
               # 2013-02-14: 1263712 (x86_64/Linux)
               # 2014-02-10:   63216 (x86_64/Linux), call arity analysis
@@ -344,10 +345,11 @@ test('T7436',
            #             127000 (amd64/Linux)
            # 2013-02-07:  60360 (amd64/Linux)
            # 2015-04-03: Widen 1->4% (amd64/Windows was doing better)
-           (wordsize(32), 42772, 1)]),
-            # 2013-02-10: 58032 (x86/Windows)
-            # 2013-02-10: 58836 (x86/OSX)
-            # 2017-03-24: 42772 (x86/Linux, 64-bit machine) no idea why
+           (wordsize(32), 42772, 4)]),
+           # 2013-02-10: 58032 (x86/Windows)
+           # 2013-02-10: 58836 (x86/OSX)
+           # 2017-03-24: 42772 (x86/Linux, 64-bit machine) no idea why
+           # 2017-04-02: Widen 1->4% (i386/Windows was doing better)
       only_ways(['normal'])
       ],
      compile_and_run,
diff --git a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32 b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32
new file mode 100644 (file)
index 0000000..73d736c
--- /dev/null
@@ -0,0 +1,25 @@
+GHC runtime linker: fatal error: I found a duplicate definition for symbol
+   _a
+whilst processing object file
+   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libfoo_link_lib_3.a
+The symbol was previously defined in
+   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libbar_link_lib_3.a(bar_link_lib_3.o)
+This could be caused by:
+   * Loading two different object files which export the same symbol
+   * Specifying the same object file twice on the GHCi command line
+   * An incorrect `package.conf' entry, causing some object to be
+     loaded twice.
+ghc-stage2.exe: ^^ Could not load '_c', dependency unresolved. See top entry above.
+
+
+ByteCodeLink: can't find label
+During interactive linking, GHCi couldn't find the following symbol:
+  c
+This may be due to you not asking GHCi to load extra object files,
+archives or DLLs needed by your current session.  Restart GHCi, specifying
+the missing library using the -L/path/to/object/dir and -lmissinglibname
+flags, or simply by naming the relevant files on the GHCi command line.
+Alternatively, this link failure might indicate a bug in GHCi.
+If you suspect the latter, please send a bug report to:
+  glasgow-haskell-bugs@haskell.org
+
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32 b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
new file mode 100644 (file)
index 0000000..48245cc
--- /dev/null
@@ -0,0 +1,25 @@
+GHC runtime linker: fatal error: I found a duplicate definition for symbol
+   _a
+whilst processing object file
+   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_simple_duplicate_lib.run\libfoo_dup_lib.a
+The symbol was previously defined in
+   E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_simple_duplicate_lib.run\bar_dup_lib.o
+This could be caused by:
+   * Loading two different object files which export the same symbol
+   * Specifying the same object file twice on the GHCi command line
+   * An incorrect `package.conf' entry, causing some object to be
+     loaded twice.
+ghc-stage2.exe: ^^ Could not load '_c', dependency unresolved. See top entry above.
+
+
+ByteCodeLink: can't find label
+During interactive linking, GHCi couldn't find the following symbol:
+  c
+This may be due to you not asking GHCi to load extra object files,
+archives or DLLs needed by your current session.  Restart GHCi, specifying
+the missing library using the -L/path/to/object/dir and -lmissinglibname
+flags, or simply by naming the relevant files on the GHCi command line.
+Alternatively, this link failure might indicate a bug in GHCi.
+If you suspect the latter, please send a bug report to:
+  glasgow-haskell-bugs@haskell.org
+
index 0a578c0..6656e7f 100644 (file)
@@ -34,6 +34,7 @@ test('T11223_simple_duplicate',
 
 test('T11223_simple_duplicate_lib',
      [extra_files(['bar.c', 'foo.c', 'foo.hs']),
+      when(platform('i386-unknown-mingw32'), expect_broken(13515)),
       when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)],
      run_command,
      ['$MAKE -s --no-print-directory t_11223_simple_duplicate_lib'])
index ce7fa65..b85b98e 100644 (file)
@@ -2,6 +2,6 @@
 #include <unistd.h>
 
 int main(int argc, char *argv[]) {
-    T7037_CONST char * args[2] = {"T7037", NULL};
+    char * T7037_CONST args[2] = {"T7037", NULL};
     execv("./T7037", args);
 }