[Git][ghc/ghc][master] 3 commits: RTS: declare setKeepCAFs symbol

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
42b05e9b by sheaf at 2023-07-22T12:36:00-04:00
RTS: declare setKeepCAFs symbol

Commit 08ba8720 failed to declare the dependency of keepCAFsForGHCi on
the symbol setKeepCAFs in the RTS, which led to undefined symbol errors
on Windows, as exhibited by the testcase frontend001.

Thanks to Moritz Angermann and Ryan Scott for the diagnosis and fix.

Fixes #22961

- - - - -
a72015d6 by sheaf at 2023-07-22T12:36:01-04:00
Mark plugins-external as broken on Windows

This test is broken on Windows, so we explicitly mark it as such now
that we stop skipping plugin tests on Windows.

- - - - -
cb9c93d7 by sheaf at 2023-07-22T12:36:01-04:00
Stop marking plugin tests as fragile on Windows

Now that b2bb3e62 has landed we are in a better situation with
regards to plugins on Windows, allowing us to unmark many plugin tests
as fragile.

Fixes #16405

- - - - -


4 changed files:

- rts/RtsSymbols.c
- testsuite/tests/ghci/should_run/all.T
- testsuite/tests/plugins/all.T
- testsuite/tests/simplCore/should_compile/all.T


Changes:

=====================================
rts/RtsSymbols.c
=====================================
@@ -946,6 +946,7 @@ extern char **environ;
       SymI_HasProto(arenaAlloc)                                         \
       SymI_HasProto(arenaFree)                                          \
       SymI_HasProto(rts_clearMemory)                                    \
+      SymI_HasProto(setKeepCAFs)                                        \
       RTS_USER_SIGNALS_SYMBOLS                                          \
       RTS_INTCHAR_SYMBOLS
 


=====================================
testsuite/tests/ghci/should_run/all.T
=====================================
@@ -46,7 +46,7 @@ test('T15369',     just_ghci, ghci_script, ['T15369.script'])
 
 test('T15633a',
      [extra_files(['tc-plugin-ghci/']),
-      when(opsys('mingw32'), [multi_cpu_race, fragile(16813)]),
+      when(opsys('mingw32'), [multi_cpu_race]),
       only_ways(['ghci']),
       pre_cmd('$MAKE -s --no-print-directory -C tc-plugin-ghci package.plugins01 TOP={top}'),
       extra_hc_opts("-package-db tc-plugin-ghci/pkg.plugins01/local.package.conf -fplugin TcPluginGHCi")
@@ -55,7 +55,7 @@ test('T15633a',
 
 test('T15633b',
      [extra_files(['tc-plugin-ghci/']),
-      when(opsys('mingw32'), [multi_cpu_race, fragile(16813)]),
+      when(opsys('mingw32'), [multi_cpu_race]),
       only_ways(['ghci']),
       pre_cmd('$MAKE -s --no-print-directory -C tc-plugin-ghci package.plugins01 TOP={top}'),
       extra_hc_opts("-package-db tc-plugin-ghci/pkg.plugins01/local.package.conf")


=====================================
testsuite/tests/plugins/all.T
=====================================
@@ -9,11 +9,6 @@ setTestOpts([
     # sequentially until this is fixed.  This likely means that #13194 isn't fully
     # solved.  See also #15313.
     when(opsys('mingw32'), multi_cpu_race),
-    # Unfortunately even with the above these tests are incredibly flaky on Windows.
-    # In any given testsuite run at least half a dozen fail for one reason of another
-    # (typically a cmmbination of timeouts, some missing static archive errors from ld,
-    # and a few plain crashes).
-    when(opsys('mingw32'), fragile(16405))
 ])
 
 
@@ -103,13 +98,11 @@ test('plugins15',
 
 test('T10420',
      [extra_files(['rule-defining-plugin/']),
-      when(opsys('mingw32'), expect_broken(21322)),
       pre_cmd('$MAKE -s --no-print-directory -C rule-defining-plugin package.T10420 TOP={top}')],
      makefile_test, [])
 
 test('T10294',
      [extra_files(['annotation-plugin/']),
-
       pre_cmd('$MAKE -s --no-print-directory -C annotation-plugin package.T10294 TOP={top}')],
      makefile_test, [])
 
@@ -262,13 +255,11 @@ test('T20218b',
 
 test('test-defaulting-plugin',
      [extra_files(['defaulting-plugin/']),
-      when(opsys('mingw32'), fragile(21293)),
       pre_cmd('$MAKE -s --no-print-directory -C defaulting-plugin package.test-defaulting-plugin TOP={top}')],
      makefile_test, [])
 
 test('test-defaulting-plugin-fail',
      [extra_files(['defaulting-plugin/']),
-      when(opsys('mingw32'), fragile(21293)),
       pre_cmd('$MAKE -s --no-print-directory -C defaulting-plugin package.test-defaulting-plugin-fail TOP={top}')],
      makefile_test, [])
 
@@ -319,7 +310,7 @@ test('test-echo-in-line-many-args',
 test('plugins-external',
      [extra_files(['shared-plugin/']),
       pre_cmd('$MAKE -s --no-print-directory -C shared-plugin package.plugins01 TOP={top}'),
-      when(opsys('linux') and not ghc_dynamic(), expect_broken(20706))],
+      when(opsys('mingw32') or (opsys('linux') and not ghc_dynamic()), expect_broken(20706))],
      makefile_test, [])
 
 test('test-phase-hooks-plugin',


=====================================
testsuite/tests/simplCore/should_compile/all.T
=====================================
@@ -151,7 +151,7 @@ test('T7702',
       # a large effect on allocation which is hard to separate from the
       # allocation done by the plugin... but a regression allocates > 90mb
       collect_compiler_stats('peak_megabytes_allocated',70),
-      when(opsys('mingw32'), fragile_for(16799, ['normal'])),
+      when(opsys('mingw32'), [multi_cpu_race]),
       req_interp
      ],
      compile,



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b91bbc2bc9a736d8d41f9cc14f0a95b9c595a01b...cb9c93d7b8db816ed4271b3703b863c1cfbbcc45

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b91bbc2bc9a736d8d41f9cc14f0a95b9c595a01b...cb9c93d7b8db816ed4271b3703b863c1cfbbcc45
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230722/2abe0505/attachment-0001.html>