From b90437d8b5c2727450cf45b12fd65cc87a8ab80e Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 24 Jun 2019 23:31:44 -0400
Subject: [PATCH] testsuite: Unbreak T16608 tests
Sleep to avoid non-determinism due to Darwin's poor mtime resolution.
Fixes #16855.
---
testsuite/tests/driver/T16608/Makefile | 2 ++
testsuite/tests/driver/T16608/all.T | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/testsuite/tests/driver/T16608/Makefile b/testsuite/tests/driver/T16608/Makefile
index f3a6fae9bea..7cec19026bc 100644
--- a/testsuite/tests/driver/T16608/Makefile
+++ b/testsuite/tests/driver/T16608/Makefile
@@ -5,6 +5,7 @@ include $(TOP)/mk/test.mk
T16608_1:
'$(TEST_HC)' $(TEST_HC_OPTS) --make -O0 T16608_1.hs
./T16608_1
+ sleep 1
sed -i -e 's/{- . succ -}/. succ/' MyInteger.hs
'$(TEST_HC)' $(TEST_HC_OPTS) --make -O0 T16608_1.hs
./T16608_1
@@ -12,6 +13,7 @@ T16608_1:
T16608_2:
'$(TEST_HC)' $(TEST_HC_OPTS) --make -O0 T16608_2.hs
./T16608_2
+ sleep 1
sed -i -e 's/{- . succ -}/. succ/' MyInteger.hs
'$(TEST_HC)' $(TEST_HC_OPTS) --make -O0 T16608_2.hs
./T16608_2
diff --git a/testsuite/tests/driver/T16608/all.T b/testsuite/tests/driver/T16608/all.T
index 1f75e596d6e..5a1b8dc4887 100644
--- a/testsuite/tests/driver/T16608/all.T
+++ b/testsuite/tests/driver/T16608/all.T
@@ -1,2 +1,2 @@
-test('T16608_1', [when(opsys('darwin'), fragile(16855)), extra_files(['MyInteger.hs'])], makefile_test, [])
-test('T16608_2', [when(opsys('darwin'), fragile(16855)), extra_files(['MyInteger.hs'])], makefile_test, [])
+test('T16608_1', [extra_files(['MyInteger.hs'])], makefile_test, [])
+test('T16608_2', [extra_files(['MyInteger.hs'])], makefile_test, [])
--
GitLab