testsuite: Add winio and winio_threaded wayswip/winio

Reverts many of the testsuite changes

11 files changed, 13 insertions, 24 deletions

diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index b561fc806e..4f053eb50f 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -68,6 +68,14 @@ if (ghc_with_llvm and not config.unregisterised):
     config.compile_ways.append('optllvm')
     config.run_ways.append('optllvm')
 
+# WinIO I/O manager for Windows
+if windows:
+    winio_ways = ['winio', 'winio_threaded']
+    if config.speed == 0:
+        config.run_ways += winio_ways
+    else:
+        config.other_ways += winio_ways
+
 config.way_flags = {
     'normal'       : [],
     'normal_h'     : [],
@@ -108,6 +116,8 @@ config.way_flags = {
     'nonmoving_thr': ['-threaded'],
     'nonmoving_thr_ghc': ['+RTS', '-xn', '-N2', '-RTS', '-threaded'],
     'compacting_gc': [],
+    'winio': [],
+    'winio_threaded': ['-threaded'],
    }
 
 config.way_rts_flags = {
@@ -150,6 +160,8 @@ config.way_rts_flags = {
     'nonmoving_thr'    : ['-xn', '-N2'],
     'nonmoving_thr_ghc': ['-xn', '-N2'],
     'compacting_gc': ['-c'],
+    'winio': ['--io-manager=native'],
+    'winio_threaded': ['--io-manager=native'],
    }
 
 # Useful classes of ways that can be used with only_ways(), omit_ways() and
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index db6d6f41e3..b2cdf78f5f 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -34,11 +34,6 @@ ifeq "$(GhcUnregisterised)" "YES"
     EXTRA_HC_OPTS += -optc-fno-builtin
 endif
 
-# These flags are for testing the native I/O of Windows's new base.  We can't
-# realistically run both as this would require two the amount of time to go
-# through the testsuite. So for now just rely on one.
-EXTRA_HC_OPTS += -with-rtsopts="--io-manager=native" # +RTS --io-manager=native -RTS
-
 # TEST_HC_OPTS is passed to every invocation of TEST_HC
 # in nested Makefiles
 TEST_HC_OPTS = -dcore-lint -dstg-lint -dcmm-lint \
diff --git a/testsuite/tests/cabal/cabal01/cabal01.stderr b/testsuite/tests/cabal/cabal01/cabal01.stderr
deleted file mode 100644
index cd2812b10c..0000000000
--- a/testsuite/tests/cabal/cabal01/cabal01.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/dynlibs/T3807.stderr b/testsuite/tests/dynlibs/T3807.stderr
deleted file mode 100644
index 81ba4e7e7d..0000000000
--- a/testsuite/tests/dynlibs/T3807.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.
-Warning: -rtsopts and -with-rtsopts have no effect with -no-hs-main.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/rts/T15261/T15261b.stdout b/testsuite/tests/rts/T15261/T15261b.stdout
index 7d1018b774..80184e82ab 100644
--- a/testsuite/tests/rts/T15261/T15261b.stdout
+++ b/testsuite/tests/rts/T15261/T15261b.stdout
@@ -1 +1 @@
- ,("Flag -with-rtsopts", "--io-manager=native")
+ ,("Flag -with-rtsopts", "")
diff --git a/testsuite/tests/rts/T7037.stderr b/testsuite/tests/rts/T7037.stderr
deleted file mode 100644
index 3028d7b882..0000000000
--- a/testsuite/tests/rts/T7037.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -no-hs-main.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/rts/linker/T5435_dyn_asm.stderr b/testsuite/tests/rts/linker/T5435_dyn_asm.stderr
deleted file mode 100644
index cd2812b10c..0000000000
--- a/testsuite/tests/rts/linker/T5435_dyn_asm.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/rts/linker/T5435_dyn_gcc.stderr b/testsuite/tests/rts/linker/T5435_dyn_gcc.stderr
deleted file mode 100644
index cd2812b10c..0000000000
--- a/testsuite/tests/rts/linker/T5435_dyn_gcc.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/rts/linker/linker_unload.stderr b/testsuite/tests/rts/linker/linker_unload.stderr
deleted file mode 100644
index 3028d7b882..0000000000
--- a/testsuite/tests/rts/linker/linker_unload.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -no-hs-main.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stderr b/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stderr
deleted file mode 100644
index 3028d7b882..0000000000
--- a/testsuite/tests/rts/linker/unload_multiple_objs/linker_unload_multiple_objs.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -no-hs-main.
-    Call hs_init_ghc() from your main() function to set these options.
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stderr b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stderr
deleted file mode 100644
index cd2812b10c..0000000000
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: -rtsopts and -with-rtsopts have no effect with -shared.
-    Call hs_init_ghc() from your main() function to set these options.