mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Make the 'regression' test case work on windows with gcc.
[SVN r20299]
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user