From dca3f5e22bb815926cf99a4799ea850cdc20596b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Wed, 9 Jan 2008 17:03:45 +0000
Subject: [PATCH] Updated the test so it passes on Windows. Had to change it to
 enable action output logging and compensate for the fact that now action
 names are sent to the output as well. Minor stylistic changes.

[SVN r42639]
---
 v2/test/module_actions.py | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/v2/test/module_actions.py b/v2/test/module_actions.py
index c35fb0ba5..1f4ff96a0 100644
--- a/v2/test/module_actions.py
+++ b/v2/test/module_actions.py
@@ -6,39 +6,48 @@
 # Distributed under the Boost Software License, Version 1.0. 
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
-from BoostBuild import Tester, List
+import BoostBuild
 import os
 import re
 
 spaces_re = re.compile("\ \ +")
 trailing_spaces_re = re.compile("\ +\n")
 
-t = Tester(pass_toolset=0)
+t = BoostBuild.Tester("-d+1", pass_toolset=0)
 
 t.set_tree('module-actions')
 
-expected = r'''A.act t1: X1-t1   
+#   Note that the following string contains some trailing spaces that should not
+# be removed.
+expected_output = """...found 4 targets...
+...updating 3 targets...
+A.act t1
+A.act t1: X1-t1   
+B.act t1
 B.act t1: X1-t1 X2-B  
+act t1
 act t1: X1-t1 X2-global X3-global 
+A.act t2
 A.act t2: X1-A X2-t2  
+B.act t2
 B.act t2:  X2-t2  
+act t2
 act t2: X1-global X2-t2 X3-global 
+A.act t3
 A.act t3: X1-A  X3-t3 
+B.act t3
 B.act t3:  X2-B X3-t3 
+act t3
 act t3: X1-global X2-global X3-t3 
-'''
+...updated 3 targets...
+"""
 
-# On Unixes, call to 'echo 1     2      3' produces '1 2 3' (note spacing)
+# On Unixes, call to 'echo 1     2      3' produces '1 2 3' (note the spacing)
 # Accomodate for that fact.
 if os.name != 'nt':
-    expected = re.sub(spaces_re, " ", expected)
-    expected = re.sub(trailing_spaces_re, "\n", expected)    
-
-# We expect t5 and t7's output to be dumped to stdout
-t.run_build_system(
-    stdout = expected
-)
+    expected_output = re.sub(spaces_re, " ", expected_output)
+    expected_output = re.sub(trailing_spaces_re, "\n", expected_output)    
 
+t.run_build_system(stdout=expected_output)
 t.expect_nothing_more()
 t.cleanup()
-