diff --git a/new/testing.jam b/new/testing.jam index 032824f8c..d420c1794 100644 --- a/new/testing.jam +++ b/new/testing.jam @@ -45,6 +45,7 @@ import project ; import property-set ; import virtual-target ; import path ; +import os ; rule init ( ) { } @@ -280,10 +281,11 @@ rule capture-output ( target : source : properties * ) } -if $(NT) +if [ os.name ] = NT { ENV_PATH = %PATH% ; - CATENATE = type ; + CATENATE = type ; + CP = copy ; } else { diff --git a/test/regression.py b/test/regression.py index efc78e0fa..021a478f7 100644 --- a/test/regression.py +++ b/test/regression.py @@ -49,7 +49,7 @@ run-fail r-f.cpp ; t.write("project-root.jam", "") # First test that when outcomes are expected, all .test files are created. -t.run_build_system(stderr=None, status=1) +t.run_build_system(stderr=None, status=None) t.expect_addition("bin/c.test/$toolset/debug/main-target-c/c.test") t.expect_addition("bin/c-f.test/$toolset/debug/main-target-c-f/c-f.test") t.expect_addition("bin/r.test/$toolset/debug/main-target-r/r.test") diff --git a/v2/test/regression.py b/v2/test/regression.py index efc78e0fa..021a478f7 100644 --- a/v2/test/regression.py +++ b/v2/test/regression.py @@ -49,7 +49,7 @@ run-fail r-f.cpp ; t.write("project-root.jam", "") # First test that when outcomes are expected, all .test files are created. -t.run_build_system(stderr=None, status=1) +t.run_build_system(stderr=None, status=None) t.expect_addition("bin/c.test/$toolset/debug/main-target-c/c.test") t.expect_addition("bin/c-f.test/$toolset/debug/main-target-c-f/c-f.test") t.expect_addition("bin/r.test/$toolset/debug/main-target-r/r.test") diff --git a/v2/tools/testing.jam b/v2/tools/testing.jam index 032824f8c..d420c1794 100644 --- a/v2/tools/testing.jam +++ b/v2/tools/testing.jam @@ -45,6 +45,7 @@ import project ; import property-set ; import virtual-target ; import path ; +import os ; rule init ( ) { } @@ -280,10 +281,11 @@ rule capture-output ( target : source : properties * ) } -if $(NT) +if [ os.name ] = NT { ENV_PATH = %PATH% ; - CATENATE = type ; + CATENATE = type ; + CP = copy ; } else {