From d2a10e2528ee2d88880e6ec84a02cb6b129de4e8 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 23 Sep 2024 14:34:50 -0400
Subject: [PATCH] Bump process submodule to v1.6.25.0
(cherry picked from commit 18f532f3ed021fff9529f50da2006b8a8d8b1df7)
---
libraries/process | 2 +-
testsuite/tests/process/process004.hs | 9 +++++++--
testsuite/tests/process/process004.stdout | 4 ++--
.../process/process004.stdout-javascript-unknown-ghcjs | 4 ++--
testsuite/tests/process/process004.stdout-mingw32 | 4 ++--
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/libraries/process b/libraries/process
index 8364eaa2c83..9c3bfc214c7 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 8364eaa2c83f7918be41cf3bd520e4ede1b07c35
+Subproject commit 9c3bfc214c72bbd0c8a30a1c41465deed0feaf47
diff --git a/testsuite/tests/process/process004.hs b/testsuite/tests/process/process004.hs
index d72dc6dbad2..c4fe993a188 100644
--- a/testsuite/tests/process/process004.hs
+++ b/testsuite/tests/process/process004.hs
@@ -4,8 +4,13 @@ import System.IO.Error
import System.Process
main :: IO ()
-main = do test1 `catchIOError` \e -> putStrLn ("Exc: " ++ show e)
- test2 `catchIOError` \e -> putStrLn ("Exc: " ++ show e)
+main = do
+ -- N.B. Only show the error type since the exact error text
+ -- may depend upon precise system call which @process@ decided
+ -- to use.
+ let printError e = putStrLn ("Exc: " ++ show (ioeGetErrorType e))
+ test1 `catchIOError` printError
+ test2 `catchIOError` printError
test1 :: IO ()
test1 = do
diff --git a/testsuite/tests/process/process004.stdout b/testsuite/tests/process/process004.stdout
index e8220702ad5..3e9675b80e7 100644
--- a/testsuite/tests/process/process004.stdout
+++ b/testsuite/tests/process/process004.stdout
@@ -1,2 +1,2 @@
-Exc: true: runInteractiveProcess: chdir: invalid argument (Bad file descriptor)
-Exc: true: runProcess: chdir: does not exist (No such file or directory)
+Exc: does not exist
+Exc: does not exist
diff --git a/testsuite/tests/process/process004.stdout-javascript-unknown-ghcjs b/testsuite/tests/process/process004.stdout-javascript-unknown-ghcjs
index e90c998d8a4..3e9675b80e7 100644
--- a/testsuite/tests/process/process004.stdout-javascript-unknown-ghcjs
+++ b/testsuite/tests/process/process004.stdout-javascript-unknown-ghcjs
@@ -1,2 +1,2 @@
-Exc: true: runInteractiveProcess: does not exist (No such file or directory)
-Exc: true: runProcess: does not exist (No such file or directory)
+Exc: does not exist
+Exc: does not exist
diff --git a/testsuite/tests/process/process004.stdout-mingw32 b/testsuite/tests/process/process004.stdout-mingw32
index e9e0e0cdf7f..4bd227f7b68 100644
--- a/testsuite/tests/process/process004.stdout-mingw32
+++ b/testsuite/tests/process/process004.stdout-mingw32
@@ -1,2 +1,2 @@
-Exc: true: runInteractiveProcess: invalid argument (Invalid argument)
-Exc: true: runProcess: invalid argument (Invalid argument)
+Exc: invalid argument
+Exc: invalid argument
--
GitLab