Skip to content

Commit 4879837

Browse files
authored
Merge pull request #24 from cmcgee1024/linux_fixes
Test fixes and intermittent Linux failures
2 parents 288df81 + 53e55ed commit 4879837

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

.licenseignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Package.swift
22
33
LICENSE
4+
.swift-version

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.1.0

Sources/Subprocess/Platforms/Subprocess+Linux.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ extension Configuration {
107107
}
108108
// Spawn error
109109
if spawnError != 0 {
110-
if spawnError == ENOENT {
110+
if spawnError == ENOENT || spawnError == EACCES {
111111
// Move on to another possible path
112112
continue
113113
}

Tests/SubprocessTests/SubprocessTests+Darwin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct SubprocessDarwinTests {
4141
// Check the proces ID (pid), pross group ID (pgid), and
4242
// controling terminal's process group ID (tpgid)
4343
let psResult = try await Subprocess.run(
44-
.name("/bin/bash"),
44+
.path("/bin/bash"),
4545
arguments: ["-c", "ps -o pid,pgid,tpgid -p $$"],
4646
platformOptions: platformOptions,
4747
output: .string

Tests/SubprocessTests/SubprocessTests+Linux.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct SubprocessLinuxTests {
3333
setgid(4321)
3434
}
3535
let idResult = try await Subprocess.run(
36-
.name("/usr/bin/id"),
36+
.path("/usr/bin/id"),
3737
arguments: ["-g"],
3838
platformOptions: platformOptions,
3939
output: .string

0 commit comments

Comments
 (0)