diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-06-19 10:15:08 -0400 |
|---|---|---|
| committer | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-06-22 12:54:53 -0400 |
| commit | 5ca6c227faeb709b0cdf8ec451132fd5ac274b0b (patch) | |
| tree | 12eeeb9cd33ed6d6098f74f4d8ce383e0801af73 | |
| parent | 83612ec2d8d321706798030414be43cccde7a7bd (diff) | |
| download | haskell-5ca6c227faeb709b0cdf8ec451132fd5ac274b0b.tar.gz | |
winio: Fix stderr output for ghci/linking/dyn tests.
We used to filter rtsopts, i opted to instead just accept the warning of it having no effect.
This works both for -rtsopts, as well as -with-rtsopts which winio adds.
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/T10955dyn.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/load_short_name.stderr | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/testsuite/tests/ghci/linking/dyn/Makefile b/testsuite/tests/ghci/linking/dyn/Makefile index ee345e5560..ee53d0463e 100644 --- a/testsuite/tests/ghci/linking/dyn/Makefile +++ b/testsuite/tests/ghci/linking/dyn/Makefile @@ -24,7 +24,7 @@ else CFLAGS = -fPIC endif -MY_TEST_HC_OPTS = $(filter-out -rtsopts,$(TEST_HC_OPTS)) $(CFLAGS) +MY_TEST_HC_OPTS = $(TEST_HC_OPTS) $(CFLAGS) # -------------------------------------------------------------- # Note: libAS.def is not used directly in these tests but is diff --git a/testsuite/tests/ghci/linking/dyn/T10955dyn.stderr b/testsuite/tests/ghci/linking/dyn/T10955dyn.stderr new file mode 100644 index 0000000000..e69dbaad75 --- /dev/null +++ b/testsuite/tests/ghci/linking/dyn/T10955dyn.stderr @@ -0,0 +1,4 @@ +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 -shared. + Call hs_init_ghc() from your main() function to set these options. diff --git a/testsuite/tests/ghci/linking/dyn/load_short_name.stderr b/testsuite/tests/ghci/linking/dyn/load_short_name.stderr new file mode 100644 index 0000000000..cd2812b10c --- /dev/null +++ b/testsuite/tests/ghci/linking/dyn/load_short_name.stderr @@ -0,0 +1,2 @@ +Warning: -rtsopts and -with-rtsopts have no effect with -shared. + Call hs_init_ghc() from your main() function to set these options. |