Skip to content
This repository was archived by the owner on May 27, 2021. It is now read-only.

Commit 9c2cbf3

Browse files
authored
Merge pull request #639 from JuliaGPU/tb/update
Use Base.julia_cmd better.
2 parents 87e928b + e4a4683 commit 9c2cbf3

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

test/examples.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ filter!(file -> readline(file) != "# EXCLUDE FROM TESTING", examples)
1818
cd(examples_dir) do
1919
examples = relpath.(examples, Ref(examples_dir))
2020
@testset for example in examples
21-
julia = `$(Base.julia_cmd()) --startup=no`
21+
cmd = Base.julia_cmd()
2222
if Base.JLOptions().project != C_NULL
2323
cmd = `$cmd --project=$(unsafe_string(Base.JLOptions().project))`
2424
end
2525

26-
@test success(pipeline(`$julia $example`, stderr=stderr))
26+
@test success(pipeline(`$cmd $example`, stderr=stderr))
2727
end
2828
end
2929

test/util.jl

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,11 @@ end
7777
function julia_script(code, args=``)
7878
# FIXME: this doesn't work when the compute mode is set to exclusive
7979
script = "using CUDAnative, CUDAdrv; device!($(device())); $code"
80-
cmd = ```
81-
$(Base.julia_cmd())
82-
--code-coverage=$(("none", "user", "all")[Base.JLOptions().code_coverage + 1])
83-
--color=$(Base.have_color ? "yes" : "no")
84-
--compiled-modules=$(Bool(Base.JLOptions().use_compiled_modules) ? "yes" : "no")
85-
--check-bounds=yes
86-
--startup-file=$(Base.JLOptions().startupfile == 1 ? "yes" : "no")
87-
--track-allocation=$(("none", "user", "all")[Base.JLOptions().malloc_log + 1])
88-
--eval $script
89-
```
80+
cmd = Base.julia_cmd()
9081
if Base.JLOptions().project != C_NULL
91-
# --project isn't preserved by julia_cmd()
9282
cmd = `$cmd --project=$(unsafe_string(Base.JLOptions().project))`
9383
end
94-
cmd = `$cmd $args`
84+
cmd = `$cmd --eval $script $args`
9585

9686
out = Pipe()
9787
err = Pipe()

0 commit comments

Comments
 (0)