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

Subject: [Boost-commit] svn:boost r80090 - trunk/tools/build/v2/test
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-20 07:34:28

Author: jurko
Date: 2012-08-20 07:34:27 EDT (Mon, 20 Aug 2012)
New Revision: 80090
URL: http://svn.boost.org/trac/boost/changeset/80090

Log:
Boost Build's internal module_actions.py test updated to pass when run with the --verbose option by allowing extra output lines between those expected by the test itself.
Text files modified: 
   trunk/tools/build/v2/test/module_actions.py |    15 +++++++--------                         
   1 files changed, 7 insertions(+), 8 deletions(-)

Modified: trunk/tools/build/v2/test/module_actions.py
==============================================================================
--- trunk/tools/build/v2/test/module_actions.py	(original)
+++ trunk/tools/build/v2/test/module_actions.py	2012-08-20 07:34:27 EDT (Mon, 20 Aug 2012)
@@ -91,16 +91,15 @@
     "B.act t3:  X2-B X3-t3 ",
     "act t3",
     "act t3: X1-global X2-global X3-t3 ",
-    "...updated 3 targets..."]
-expected_lines.append("")  # To add the trailing newline.
-expected_output = "\n".join(expected_lines)
+    "...updated 3 targets...",
+    ""]
 
-# On Unixes, call to 'echo 1   2     3  ' produces '1 2 3' (note the spacing)
-# Accomodate for that fact.
+# Accommodate for the fact that on Unixes, a call to 'echo 1   2     3  '
+# produces '1 2 3' (note the spacing).
 if os.name != 'nt':
-    expected_output = re.sub("  +", " ", expected_output)
-    expected_output = re.sub(" +\n", "\n", expected_output)
+    expected_lines = [re.sub("  +", " ", x.rstrip()) for x in expected_lines]
 
-t.run_build_system(stdout=expected_output)
+t.run_build_system()
+t.expect_output_lines(expected_lines)
 t.expect_nothing_more()
 t.cleanup()