summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorerthalion <9erthalion6@gmail.com>2019-04-05 22:01:52 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-04-16 15:40:36 -0400
commit57eb5bc61317e5cdf1fd5745036e443037a37451 (patch)
tree6397f09d8c0947903f7f3b3eb3a41ea890890a34 /testsuite
parentbe05bd8168b0ea65d63dc0093a5c8781a2528500 (diff)
downloadhaskell-57eb5bc61317e5cdf1fd5745036e443037a37451.tar.gz
Show dynamic object files (#16062)
Closes #16062. When -dynamic-too is specified, reflect that in the progress message, like: $ ghc Main.hs -dynamic-too [1 of 1] Compiling Lib ( Main.hs, Main.o, Main.dyn_o ) instead of: $ ghc Main.hs -dynamic-too [1 of 1] Compiling Lib ( Main.hs, Main.o )
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo006/Main.hs1
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile16
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo006/all.T2
-rw-r--r--testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr4
5 files changed, 23 insertions, 2 deletions
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/Main.hs b/testsuite/tests/driver/dynamicToo/dynamicToo006/Main.hs
new file mode 100644
index 0000000000..aab8d3ce7a
--- /dev/null
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/Main.hs
@@ -0,0 +1 @@
+main = print "a"
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile b/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile
new file mode 100644
index 0000000000..b78fc4aa8f
--- /dev/null
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile
@@ -0,0 +1,16 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+ rm -f *.o
+ rm -f *.hi
+ rm -f Main
+
+# check that the compilation progress message will contain
+# *.dyn_o file with -dynamic-too
+main:
+ rm -f *.o
+ rm -f *.hi
+ rm -f Main
+ '$(TEST_HC)' $(TEST_HC_OPTS) -dynamic-too Main.hs
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/all.T b/testsuite/tests/driver/dynamicToo/dynamicToo006/all.T
new file mode 100644
index 0000000000..c9e1b52f4e
--- /dev/null
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/all.T
@@ -0,0 +1,2 @@
+test('dynamicToo006', [normalise_slashes, extra_files(['Main.hs'])],
+ run_command, ['$MAKE -s main --no-print-director'])
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout b/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout
new file mode 100644
index 0000000000..5c33cb2e7a
--- /dev/null
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/dynamicToo006.stdout
@@ -0,0 +1,2 @@
+[1 of 1] Compiling Main ( Main.hs, Main.o, Main.dyn_o )
+Linking Main ...
diff --git a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
index c76996f5b8..e5593d57e9 100644
--- a/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
+++ b/testsuite/tests/safeHaskell/safeInfered/UnsafeInfered02.stderr
@@ -1,5 +1,5 @@
-[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o )
-[2 of 2] Compiling UnsafeInfered02 ( UnsafeInfered02.hs, UnsafeInfered02.o )
+[1 of 2] Compiling UnsafeInfered02_A ( UnsafeInfered02_A.hs, UnsafeInfered02_A.o, UnsafeInfered02_A.dyn_o )
+[2 of 2] Compiling UnsafeInfered02 ( UnsafeInfered02.hs, UnsafeInfered02.o, UnsafeInfered02.dyn_o )
UnsafeInfered02.hs:4:1: error:
UnsafeInfered02_A: Can't be safely imported!