Skip to content

Commit 994ba38

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

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
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: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,10 @@ end
322322
./test
323323
"""
324324
cmd = `/bin/bash -c "$(test_script)"`
325-
if arch(platform) == "i686" && libc(platform) == "musl"
326-
# We can't run this program for this platform
327-
@test_broken run(ur, cmd, iobuff; tee_stream=devnull)
328-
else
329-
@test run(ur, cmd, iobuff; tee_stream=devnull)
330-
seekstart(iobuff)
331-
# Test that we get the output we expect
332-
@test endswith(readchomp(iobuff), "Hello World!")
333-
end
325+
@test run(ur, cmd, iobuff; tee_stream=devnull)
326+
seekstart(iobuff)
327+
# Test that we get the output we expect
328+
@test endswith(readchomp(iobuff), "Hello World!")
334329
cleanup_dependencies(prefix, artifact_paths, concrete_platform)
335330
end
336331
end
@@ -377,15 +372,10 @@ end
377372
./test
378373
"""
379374
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
375+
@test run(ur, cmd, iobuff; tee_stream=stdout)
376+
seekstart(iobuff)
377+
# Test that we get the output we expect
378+
@test endswith(readchomp(iobuff), "Hello World!")
389379
cleanup_dependencies(prefix, artifact_paths, concrete_platform)
390380
end
391381
end

0 commit comments

Comments
 (0)