diff options
Diffstat (limited to 'testsuite/tests/plugins')
| -rw-r--r-- | testsuite/tests/plugins/LinkerTicklingPlugin.hs | 4 | ||||
| -rw-r--r-- | testsuite/tests/plugins/all.T | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/tests/plugins/LinkerTicklingPlugin.hs b/testsuite/tests/plugins/LinkerTicklingPlugin.hs index 52d5e177bb..7ee63cd7a0 100644 --- a/testsuite/tests/plugins/LinkerTicklingPlugin.hs +++ b/testsuite/tests/plugins/LinkerTicklingPlugin.hs @@ -12,4 +12,6 @@ plugin = defaultPlugin { -- or a new instance of it. If it is a new instance the staticFlags -- won't have been initialised, so we'll get a GHC panic here: install :: [CommandLineOption] -> [CoreToDo] -> CoreM [CoreToDo] -install _options todos = length staticFlags `seq` return todos +install _options todos = reinitializeGlobals >> (length staticFlags `seq` return todos) + --- XXX: remove reinitializeGlobals when we have fixed the linker + -- problem (see comment with reinitializeGlobals in CoreMonad.hs) diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T index b9d4e4497d..6723aad35f 100644 --- a/testsuite/tests/plugins/all.T +++ b/testsuite/tests/plugins/all.T @@ -12,7 +12,7 @@ test('plugins03', normal, compile_fail, ['-package-conf simple-plugin/local.pack test('plugins04', extra_clean(['HomePackagePlugin.hi', 'HomePackagePlugin.o']), multimod_compile_fail, ['plugins04', '-package ghc -fplugin HomePackagePlugin']) test('plugins05', extra_clean(['HomePackagePlugin.hi', 'HomePackagePlugin.o']), multimod_compile_and_run, ['plugins05', '-package ghc']) -test('plugins06', compose(expect_broken(3843), extra_clean(['LinkerTicklingPlugin.hi', 'LinkerTicklingPlugin.o'])), multimod_compile_and_run, ['plugins06', '-package ghc']) +test('plugins06', extra_clean(['LinkerTicklingPlugin.hi', 'LinkerTicklingPlugin.o']), multimod_compile_and_run, ['plugins06', '-package ghc']) if default_testopts.cleanup != '': runCmd('$MAKE -C ' + in_testdir('') + ' clean') |