From 484b71cf3ff1b6ab3fe50b3721f32ea601c8ff59 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 14 Nov 2005 13:38:49 +0000 Subject: [PATCH] Adjust tests to the fact that print.text no longer implicitly adds newline. [SVN r31643] --- v2/test/custom_generator.py | 2 +- v2/test/print.py | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/v2/test/custom_generator.py b/v2/test/custom_generator.py index d0901ab71..5a66daa35 100644 --- a/v2/test/custom_generator.py +++ b/v2/test/custom_generator.py @@ -48,7 +48,7 @@ t.write("r.rcc", """ """) t.run_build_system() -t.expect_content("bin/$toolset/debug/r.obj", "rc-object\n") +t.expect_content("bin/$toolset/debug/r.obj", "rc-object") t.cleanup() diff --git a/v2/test/print.py b/v2/test/print.py index 3500b91f9..77d83f619 100644 --- a/v2/test/print.py +++ b/v2/test/print.py @@ -14,21 +14,19 @@ ALWAYS foo ; """) t.run_build_system() -t.expect_content("foo", """\"Something\" -""") +t.expect_content("foo", """\"Something\"""") t.write("Jamfile", """ import print ; print.output foo ; -print.text \\\"Somethingelse\\\" ; +print.text \\\n\\\"Somethingelse\\\" ; DEPENDS all : foo ; ALWAYS foo ; """) t.run_build_system() t.expect_content("foo", """\"Something\" -\"Somethingelse\" -""") +\"Somethingelse\"""") t.write("Jamfile", """ import print ; @@ -39,7 +37,6 @@ ALWAYS foo ; """) t.run_build_system() -t.expect_content("foo", """\"Different\" -""") +t.expect_content("foo", """\"Different\"""") t.cleanup()