From db2973ae96e177b1f0f7647a5a22efb0a8398a8d Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Sun, 6 Dec 2015 20:59:58 -0800 Subject: [PATCH] modify path for tests that shell out on windows without this, 0.5 nightlies (though new nightlies haven't been built for about a week, so not yet) and 0.4.2 will call the windows native versions of these rather than coreutils, giving either different line endings or more substantially different behavior --- test/runtests.jl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 2c584385893d2..37e536a0da8ba 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -160,8 +160,11 @@ end @test CartesianTest.f(1,2,3,4) == (1,2,3,4) @test CartesianTest.f(1,2,3,4,5) == (1,2,3,4,5) -@test readall(pipeline(`echo hello`, `sort`)) == "hello\n" -@test success(pipeline(`true`, `true`)) +extrapath = @windows? joinpath(JULIA_HOME,"..","Git","usr","bin")*";" : "" +@compat withenv("PATH" => extrapath * ENV["PATH"]) do + @test readall(pipeline(`echo hello`, `sort`)) == "hello\n" + @test success(pipeline(`true`, `true`)) +end let convert_funcs_and_types = ((integer, :Integer), (signed, :Signed), (unsigned, :Unsigned),