From 08d3eeb91967bfbbc92b44f9d2faac6400500c3e Mon Sep 17 00:00:00 2001
From: sheaf <sam.derbyshire@gmail.com>
Date: Fri, 17 Mar 2023 12:26:49 +0100
Subject: [PATCH] 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
(cherry picked from commit cb9c93d7b8db816ed4271b3703b863c1cfbbcc45)
---
testsuite/tests/ghci/should_run/all.T | 4 ++--
testsuite/tests/simplCore/should_compile/all.T | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T
index dfe0adaf627..9a73da55f48 100644
--- a/testsuite/tests/ghci/should_run/all.T
+++ b/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")
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 6f01f62906d..2851e125ed2 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/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,
--
GitLab