From e498a3c6591dd2aa3e3f5675f64e05c437f01b4e Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Wed, 8 Oct 2003 05:49:57 +0000
Subject: [PATCH] Make the 'regression' test case work on windows with gcc.

[SVN r20299]
---
 new/testing.jam       | 6 ++++--
 test/regression.py    | 2 +-
 v2/test/regression.py | 2 +-
 v2/tools/testing.jam  | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

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
 {