From ce7fe5a916d50f471812f4714615e13f557fe57a Mon Sep 17 00:00:00 2001
From: Rodrigo Mesquita <rodrigo.m.mesquita@gmail.com>
Date: Wed, 8 Nov 2023 11:43:22 +0000
Subject: [PATCH] testsuite: Update to LC_ALL=C no longer being ignored in
darwin
MacOS seems to have fixed an issue where it used to ignore the variable
`LC_ALL` in program invocations and default to using Unicode.
Since the behaviour seems to be fixed to account for the locale
variable, we mark tests that were previously broken in spite of it as
fragile (since they now pass in recent macOS distributions)
See #24161
---
testsuite/tests/driver/Makefile | 4 ++--
testsuite/tests/driver/all.T | 21 +++++++++++++++------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile
index 6150dfbce701..dc45e8486a5d 100644
--- a/testsuite/tests/driver/Makefile
+++ b/testsuite/tests/driver/Makefile
@@ -552,8 +552,8 @@ T7563:
-"$(TEST_HC)" $(TEST_HC_OPTS) -C T7563.hs
# Below we set LC_ALL=C to request standard ASCII output in the resulting error
-# messages. Unfortunately, Mac OS X and Windows still use a Unicode encoding
-# even with LC_ALL=C, so we expect these tests to fail there.
+# messages. Unfortunately, versions of MacOS prior to Sonoma and Windows still
+# use a Unicode encoding even with LC_ALL=C, so we expect these tests to fail there.
.PHONY: T6037
T6037:
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index 1e657a0217b9..a93b23be3794 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -178,16 +178,25 @@ test('T7060', [], makefile_test, [])
test('T7130', normal, compile_fail, ['-fflul-laziness'])
test('T7563', when(unregisterised(), skip), makefile_test, [])
test('T6037',
- # The testsuite doesn't know how to set a non-Unicode locale on Windows or Mac OS X
- [when(opsys('mingw32'), expect_fail), when(opsys('darwin'), expect_fail)],
+ # The testsuite doesn't know how to set a non-Unicode locale on Windows or MacOS < Sonoma.
+ # Because in previous version of MacOS the test is still broken, we mark it as fragile.
+ [when(opsys('mingw32'), expect_fail),
+ when(opsys('darwin'), fragile(24161))
+ ],
makefile_test, [])
test('T2507',
- # The testsuite doesn't know how to set a non-Unicode locale on Windows or Mac OS X
- [when(opsys('mingw32'), expect_fail), when(opsys('darwin'), expect_fail)],
+ # The testsuite doesn't know how to set a non-Unicode locale on Windows or MacOS < Sonoma
+ # Because in previous version of MacOS the test is still broken, we mark it as fragile.
+ [when(opsys('mingw32'), expect_fail),
+ when(opsys('darwin'), fragile(24161))
+ ],
makefile_test, [])
test('T8959a',
- # The testsuite doesn't know how to set a non-Unicode locale on Windows or Mac OS X
- [when(opsys('mingw32'), expect_fail), when(opsys('darwin'), expect_fail)],
+ # The testsuite doesn't know how to set a non-Unicode locale on Windows or MacOS < Sonoma
+ # Because in previous version of MacOS the test is still broken, we mark it as fragile.
+ [when(opsys('mingw32'), expect_fail),
+ when(opsys('darwin'), fragile(24161))
+ ],
makefile_test, [])
# Requires readelf
--
GitLab