Skip to content

Commit f3882ce

Browse files
committed
[Runner] Fix order order of CSL libraries in LD_LIBRARY_PATH
Move target before host.
1 parent a63742a commit f3882ce

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/Runner.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function ld_library_path(target::AbstractPlatform,
7575
# that can natively run within this environment
7676
if csl_paths
7777
append!(paths,
78-
unique("/usr/lib/csl-$(libc(p))-$(arch(p))" for p in (host, target) if Sys.islinux(p) && proc_family(p) == "intel"),
78+
unique("/usr/lib/csl-$(libc(p))-$(arch(p))" for p in (target, host) if Sys.islinux(p) && proc_family(p) == "intel"),
7979
)
8080
end
8181

test/runners.jl

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -377,15 +377,10 @@ using Pkg
377377
./test 2>&1
378378
"""
379379
cmd = `/bin/bash -c "$(test_script)"`
380-
if arch(platform) == "i686" && libc(platform) == "musl"
381-
# We can't run C++ programs for this platform
382-
@test_broken run(ur, cmd, iobuff; tee_stream=devnull)
383-
else
384-
@test run(ur, cmd, iobuff; tee_stream=stdout)
385-
seekstart(iobuff)
386-
# Test that we get the output we expect
387-
@test endswith(readchomp(iobuff), "Hello World!")
388-
end
380+
@test run(ur, cmd, iobuff; tee_stream=stdout)
381+
seekstart(iobuff)
382+
# Test that we get the output we expect
383+
@test endswith(readchomp(iobuff), "Hello World!")
389384
cleanup_dependencies(prefix, artifact_paths, concrete_platform)
390385
end
391386
end

0 commit comments

Comments
 (0)