Use Base.julia_cmd

JuliaGPU · Apr 24, 2020 · 4a1d0b2 · 4a1d0b2
1 parent 99f3989
commit 4a1d0b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/test/examples.jl b/test/examples.jl
@@ -18,8 +18,12 @@ filter!(file -> readline(file) != "# EXCLUDE FROM TESTING", examples)
 cd(examples_dir) do
     examples = relpath.(examples, Ref(examples_dir))
     @testset for example in examples
-        cmd = julia_cmd(`$example`)
-        @test success(pipeline(cmd, stderr=stderr))
+        julia = `$(Base.julia_cmd()) --startup=no`
+        if Base.JLOptions().project != C_NULL
+            cmd = `$cmd --project=$(unsafe_string(Base.JLOptions().project))`
+        end
+
+        @test success(pipeline(`$julia $example`, stderr=stderr))
     end
 end
 

diff --git a/test/util.jl b/test/util.jl
@@ -53,16 +53,3 @@ end
 @test isa(fails[1], Test.Pass)
 @test isa(fails[2], Test.Fail)
 @test isa(fails[3], Test.Fail)
-
-function julia_cmd(cmd)
-    return `
-        $(Base.julia_cmd())
-        --color=$(Base.have_color ? "yes" : "no")
-        --compiled-modules=$(Base.JLOptions().use_compiled_modules != 0 ? "yes" : "no")
-        --history-file=no
-        --startup-file=$(Base.JLOptions().startupfile != 2 ? "yes" : "no")
-        --code-coverage=$(["none", "user", "all"][1+Base.JLOptions().code_coverage])
-        $cmd
-    `
-end
-