From 4faa0280b31792a8ce58c2cc8877c67279a55f6b Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Mon, 3 Jan 2005 20:35:15 +0000
Subject: Win32 portability fixes.

---
 src/engine/SCons/Node/NodeTests.py |  2 +-
 src/engine/SCons/Util.py           |  4 ++--
 src/engine/SCons/UtilTests.py      | 14 ++++++++++----
 test/Java/JAVACCOMSTR.py           | 11 +++++++++--
 test/RCS/implicit.py               |  8 +++++++-
 test/multi.py                      |  6 ++++--
 test/pre-post-actions.py           |  5 +++--
 test/scan-once.py                  |  4 ++--
 8 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 106e44e..ee0e82b 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -1179,7 +1179,7 @@ class NodeListTestCase(unittest.TestCase):
             assert s == "['n3', 'n2', 'n1']", s
 
         r = repr(nl)
-        r = re.sub('at (0x)?[0-9a-z]+', 'at 0x', r)
+        r = re.sub('at (0[xX])?[0-9a-fA-F]+', 'at 0x', r)
         # Don't care about ancestry: just leaf value of MyNode
         r = re.sub('<.*?\.MyNode', '<MyNode', r)
         # New-style classes report as "object"; classic classes report
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index d8f0a74..361b18c 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -614,7 +614,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={
                                 s = eval(key, self.gvars, lvars)
                             except AttributeError, e:
                                 raise SCons.Errors.UserError, \
-                                      "Error substituting `%s': unknown attribute `%s'" % (key, e)
+                                      "Error trying to evaluate `%s': %s" % (s, e)
                             except (IndexError, NameError, TypeError):
                                 return ''
                             except SyntaxError,e:
@@ -813,7 +813,7 @@ def scons_subst_list(strSubst, env, mode=SUBST_RAW, target=None, source=None, gv
                             s = eval(key, self.gvars, lvars)
                         except AttributeError, e:
                             raise SCons.Errors.UserError, \
-                                  "Error substituting `%s': unknown attribute `%s'" % (key, e)
+                                  "Error trying to evaluate `%s': %s" % (s, e)
                         except (IndexError, NameError, TypeError):
                             return
                         except SyntaxError,e:
diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py
index 3ae3b48..6236038 100644
--- a/src/engine/SCons/UtilTests.py
+++ b/src/engine/SCons/UtilTests.py
@@ -456,8 +456,11 @@ class UtilTestCase(unittest.TestCase):
                 pass
             scons_subst('${foo.bar}', env, gvars={'foo':Foo()})
         except SCons.Errors.UserError, e:
-            expect = "Error substituting `foo.bar': unknown attribute `bar'"
-            assert str(e) == expect, e
+            expect = [
+                "Error trying to evaluate `${foo.bar}': bar",
+                "Error trying to evaluate `${foo.bar}': Foo instance has no attribute 'bar'",
+            ]
+            assert str(e) in expect, e
         else:
             raise AssertionError, "did not catch expected UserError"
 
@@ -870,8 +873,11 @@ class UtilTestCase(unittest.TestCase):
                 pass
             scons_subst_list('${foo.bar}', env, gvars={'foo':Foo()})
         except SCons.Errors.UserError, e:
-            expect = "Error substituting `foo.bar': unknown attribute `bar'"
-            assert str(e) == expect, e
+            expect = [
+                "Error trying to evaluate `${foo.bar}': bar",
+                "Error trying to evaluate `${foo.bar}': Foo instance has no attribute 'bar'",
+            ]
+            assert str(e) in expect, e
         else:
             raise AssertionError, "did not catch expected UserError"
 
diff --git a/test/Java/JAVACCOMSTR.py b/test/Java/JAVACCOMSTR.py
index 306ae57..7f59e90 100644
--- a/test/Java/JAVACCOMSTR.py
+++ b/test/Java/JAVACCOMSTR.py
@@ -29,6 +29,8 @@ Test that the $JAVACCOMSTR construction variable allows you to configure
 the javac output.
 """
 
+import os.path
+
 import TestSCons
 
 python = TestSCons.python
@@ -60,9 +62,14 @@ test.write(['src', 'file1.java'], "file1.java\n/*javac*/\n")
 test.write(['src', 'file2.java'], "file2.java\n/*javac*/\n")
 test.write(['src', 'file3.java'], "file3.java\n/*javac*/\n")
 
+classes_src_file1_class = os.path.join('classes', 'src', 'file1.class')
+src_file1_java= os.path.join('src', 'file1.java')
+src_file2_java= os.path.join('src', 'file2.java')
+src_file3_java= os.path.join('src', 'file3.java')
+
 test.run(stdout = test.wrap_stdout("""\
-Compiling class(es) classes/src/file1.class from src/file1.java src/file2.java src/file3.java
-"""))
+Compiling class(es) %(classes_src_file1_class)s from %(src_file1_java)s %(src_file2_java)s %(src_file3_java)s
+""" % locals()))
 
 test.must_match(['classes', 'src', 'file1.class'],
                 "file1.java\nfile2.java\nfile3.java\n")
diff --git a/test/RCS/implicit.py b/test/RCS/implicit.py
index 684a24b..2289258 100644
--- a/test/RCS/implicit.py
+++ b/test/RCS/implicit.py
@@ -42,6 +42,11 @@ if not ci:
     print "Could not find `ci' command, skipping test(s)."
     test.pass_test(1)
 
+co = test.where_is('co')
+if not co:
+    print "Could not find `co' command, skipping test(s)."
+    test.pass_test(1)
+
 
 
 test.subdir('RCS')
@@ -66,9 +71,10 @@ test.run(program = ci,
          stderr = None)
 
 test.write('SConstruct', """
+DefaultEnvironment(RCS_CO = r'%s')
 env = Environment()
 env.Program('foo.c')
-""")
+""" % co)
 
 test.run(stderr="""\
 RCS/foo.c,v  -->  foo.c
diff --git a/test/multi.py b/test/multi.py
index 7ae1736..1977679 100644
--- a/test/multi.py
+++ b/test/multi.py
@@ -28,9 +28,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test various cases where a target is "built" by multiple builder calls.
 """
 
+import os.path
+import string
+
 import TestCmd
 import TestSCons
-import os.path
 
 test = TestSCons.TestSCons(match=TestCmd.match_re)
 
@@ -173,7 +175,7 @@ test.run(arguments='file4.out',
          stderr=TestSCons.re_escape("""
 scons: warning: Two different environments were specified for target file4.out,
 	but they appear to have the same action: %(python)s build.py \$foo \$TARGET \$SOURCES
-""" % {'python':TestSCons.python}) + TestSCons.file_expr)
+""" % {'python':string.replace(TestSCons.python, '\\', '\\\\')}) + TestSCons.file_expr)
 
 test.must_match('file4.out', "3\nfile4a.in\nfile4b.in\n")
 
diff --git a/test/pre-post-actions.py b/test/pre-post-actions.py
index 860ae24..2d8458c 100644
--- a/test/pre-post-actions.py
+++ b/test/pre-post-actions.py
@@ -28,6 +28,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
+import os.path
 import stat
 import sys
 import TestSCons
@@ -162,8 +163,8 @@ env.Command('dir/file', [], build)
 test.run(chdir = 'work3', arguments = 'dir/file', stdout=test.wrap_stdout("""\
 pre(["dir"], [])
 post(["dir"], [])
-build(["dir/file"], [])
-"""))
+build(["%s"], [])
+""" % os.path.join('dir', 'file')))
 
 test.must_match(['work3', 'dir', 'file'], "build()\n")
 
diff --git a/test/scan-once.py b/test/scan-once.py
index 4436310..cdacccc 100644
--- a/test/scan-once.py
+++ b/test/scan-once.py
@@ -96,7 +96,7 @@ test.write(['SLF', 'SConscript'], """\
 ### don't seem to work well!  ARRGH!!!!
 ###
 
-experimenttop = "%s"
+experimenttop = r"%s"
 
 import os
 import os.path
@@ -287,7 +287,7 @@ static_hdrs = "libg_w.h"
 #exported_hdrs = generated_hdrs + " " + static_hdrs
 exported_hdrs = static_hdrs
 lib_name = "g"
-lib_fullname = "libg.a"
+lib_fullname = env.subst("${LIBPREFIX}g${LIBSUFFIX}")
 lib_srcs = string.split("libg_1.c libg_2.c libg_3.c")
 import re
 lib_objs = map(lambda x: re.sub("\.c$", ".o", x), lib_srcs)
-- 
cgit v0.12