From e5dbf2f4db06c53dda4c74f86145899c7edf232d Mon Sep 17 00:00:00 2001 From: Steven Watanabe Date: Wed, 7 Dec 2011 17:14:57 +0000 Subject: [PATCH] Fix unit-tests when running on Linux with Windows \r\n new lines. [SVN r75852] --- v2/tools/common.jam | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/v2/tools/common.jam b/v2/tools/common.jam index f2cd4b69f..53e91b428 100644 --- a/v2/tools/common.jam +++ b/v2/tools/common.jam @@ -961,25 +961,22 @@ rule __test__ ( ) { 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) ;