From 55346ede95d594dfff9e66ed4b864f57537b242d Mon Sep 17 00:00:00 2001
From: Sylvain Henry <sylvain@haskus.fr>
Date: Fri, 9 Feb 2024 16:01:27 +0100
Subject: [PATCH] JS: disable MergeObjsMode test
This isn't implemented for JS backend objects.
---
testsuite/tests/driver/MergeObjsMode/A.hs | 2 ++
testsuite/tests/driver/MergeObjsMode/B.hs | 2 ++
testsuite/tests/driver/MergeObjsMode/all.T | 1 +
3 files changed, 5 insertions(+)
diff --git a/testsuite/tests/driver/MergeObjsMode/A.hs b/testsuite/tests/driver/MergeObjsMode/A.hs
index af7ebc8eb944..ad16a8853478 100644
--- a/testsuite/tests/driver/MergeObjsMode/A.hs
+++ b/testsuite/tests/driver/MergeObjsMode/A.hs
@@ -1,5 +1,7 @@
module A where
+-- Don't inline otherwise A.o may not be needed by Main.o
+{-# NOINLINE a #-}
a :: Int
a = 42
diff --git a/testsuite/tests/driver/MergeObjsMode/B.hs b/testsuite/tests/driver/MergeObjsMode/B.hs
index 0cb45d3f5411..cffbdf42d83c 100644
--- a/testsuite/tests/driver/MergeObjsMode/B.hs
+++ b/testsuite/tests/driver/MergeObjsMode/B.hs
@@ -1,4 +1,6 @@
module B where
+-- Don't inline otherwise B.o may not be needed by Main.o
+{-# NOINLINE b #-}
b :: String
b = "hello world"
diff --git a/testsuite/tests/driver/MergeObjsMode/all.T b/testsuite/tests/driver/MergeObjsMode/all.T
index 89025a588ada..7d17414a8388 100644
--- a/testsuite/tests/driver/MergeObjsMode/all.T
+++ b/testsuite/tests/driver/MergeObjsMode/all.T
@@ -1,5 +1,6 @@
test('MergeObjsMode',
[ extra_files(['A.hs', 'B.hs', 'Main.hs'])
+ , js_skip # Object merging isn't supported by the JS backend
],
makefile_test,
[])
--
GitLab