[Boost-commit] svn:boost r75852 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r75852 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2011-12-07 12:14:58

Author: steven_watanabe
Date: 2011-12-07 12:14:57 EST (Wed, 07 Dec 2011)
New Revision: 75852
URL: http://svn.boost.org/trac/boost/changeset/75852

Log:
Fix unit-tests when running on Linux with Windows \r\n new lines.
Text files modified: 
   trunk/tools/build/v2/tools/common.jam |    11 ++++-------                             
   1 files changed, 4 insertions(+), 7 deletions(-)

Modified: trunk/tools/build/v2/tools/common.jam
==============================================================================
--- trunk/tools/build/v2/tools/common.jam	(original)
+++ trunk/tools/build/v2/tools/common.jam	2011-12-07 12:14:57 EST (Wed, 07 Dec 2011)
@@ -961,25 +961,22 @@
 {
     import assert ;
 
-    local nl = "
-" ;
-
     local save-os = [ modules.peek os : .name ] ;
 
     modules.poke os : .name : LINUX ;
 
-    assert.result "PATH=\"foo:bar:baz\"$(nl)export PATH$(nl)"
+    assert.result "PATH=\"foo:bar:baz\"\nexport PATH\n"
         : path-variable-setting-command PATH : foo bar baz ;
 
-    assert.result "PATH=\"foo:bar:$PATH\"$(nl)export PATH$(nl)"
+    assert.result "PATH=\"foo:bar:$PATH\"\nexport PATH\n"
         : prepend-path-variable-command PATH : foo bar ;
 
     modules.poke os : .name : NT ;
 
-    assert.result "set PATH=foo;bar;baz$(nl)"
+    assert.result "set PATH=foo;bar;baz\n"
         : path-variable-setting-command PATH : foo bar baz ;
 
-    assert.result "set PATH=foo;bar;%PATH%$(nl)"
+    assert.result "set PATH=foo;bar;%PATH%\n"
         : prepend-path-variable-command PATH : foo bar ;
 
     modules.poke os : .name : $(save-os) ;