Merge branch 'master' of mac:ghc/git/val32/testsuite

testsuite/tests/dynlibs/Makefile

@@ -9,7 +9,7 @@ T3807:
 	$(RM) T3807-export.o T3807-load.o
 	$(RM) T3807test.so
 	$(RM) T3807-load
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -dynamic -fPIC -shared T3807Export.hs T3807-export.c -o T3807test.so -lHSrts-ghc`'$(TEST_HC)' $(TEST_HC_OPTS) --numeric-version`
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -dynamic -fPIC -shared T3807Export.hs T3807-export.c -o T3807test.so -lHSrts-ghc`'$(TEST_HC)' $(TEST_HC_OPTS) --numeric-version` -rtsopts
 	'$(TEST_HC)' $(TEST_HC_OPTS) -no-auto-link-packages -no-hs-main T3807-load.c -o T3807-load -ldl
 	./T3807-load
 
@@ -30,3 +30,14 @@ T4464:
 	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe
 	./t4464.exe
 
+.PHONY: T5373
+T5373:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373A
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373B -rtsopts
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373C -rtsopts=some
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -dynamic --make T5373D -rtsopts=none
+	-./T5373A +RTS -\? 2>&1 | grep disabled
+	-./T5373B +RTS -\? 2>&1 | grep disabled
+	-./T5373C +RTS -\? 2>&1 | grep disabled
+	-./T5373D +RTS -\? 2>&1 | grep disabled
+

testsuite/tests/dynlibs/T5373.stdout

+T5373A: Most RTS options are disabled. Link with -rtsopts to enable them.
+T5373C: Most RTS options are disabled. Link with -rtsopts to enable them.
+T5373D: RTS options are disabled. Link with -rtsopts to enable them.

testsuite/tests/dynlibs/T5373A.hs

+
+main :: IO ()
+main = return ()
+

testsuite/tests/dynlibs/T5373B.hs

+
+main :: IO ()
+main = return ()
+

testsuite/tests/dynlibs/T5373C.hs

+
+main :: IO ()
+main = return ()
+

testsuite/tests/dynlibs/T5373D.hs

+
+main :: IO ()
+main = return ()
+

testsuite/tests/dynlibs/all.T

@@ -18,3 +18,13 @@ test('T4464',
      run_command,
      ['$MAKE --no-print-directory -s T4464'])
 
+test('T5373',
+     [extra_clean(['T5373A.hi',  'T5373B.hi',  'T5373C.hi',  'T5373D.hi',
+                   'T5373A.o',   'T5373B.o',   'T5373C.o',   'T5373D.o',
+                   'T5373A',     'T5373B',     'T5373C',     'T5373D',
+                   'T5373A.exe', 'T5373B.exe', 'T5373C.exe', 'T5373D.exe']),
+      if_os('mingw32', expect_broken(5373)),
+      if_os('darwin', expect_broken(5373))],
+     run_command,
+     ['$MAKE --no-print-directory -s T5373'])
+