More efficient Node.FS.Dir.current() check. Fix some Windows test portability issues.

3 files changed, 15 insertions, 4 deletions

diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py
index f20adb5..ae63ea0 100644
--- a/test/AR/ARCOMSTR.py
+++ b/test/AR/ARCOMSTR.py
@@ -30,6 +30,7 @@ the displayed archiver string.
 """
 
 import TestSCons
+import string
 
 python = TestSCons.python
 
@@ -63,10 +64,10 @@ env.Library(target = 'output', source = ['file.1', 'file.2'])
 test.write('file.1', "file.1\n/*ar*/\n")
 test.write('file.2', "file.2\n/*ar*/\n")
 
-test.run(stdout = test.wrap_stdout("""\
-Archiving output.lib from file.1 file.2
-%s myranlib.py output.lib
-""" % python))
+test.run()
+
+expect = 'Archiving output.lib from file.1 file.2'
+test.fail_test(string.find(test.stdout(), expect) == -1)
 
 test.must_match('output.lib', "file.1\nfile.2\n")
 
diff --git a/test/RANLIB/RANLIBCOM.py b/test/RANLIB/RANLIBCOM.py
index 25f2f61..d60a14e 100644
--- a/test/RANLIB/RANLIBCOM.py
+++ b/test/RANLIB/RANLIBCOM.py
@@ -34,6 +34,11 @@ python = TestSCons.python
 
 test = TestSCons.TestSCons()
 
+ranlib = test.detect('RANLIB', 'ranlib')
+
+if not ranlib:
+    test.skip_test("Could not find 'ranlib', skipping test.\n")
+
 
 
 test.write('myar.py', """
diff --git a/test/RANLIB/RANLIBCOMSTR.py b/test/RANLIB/RANLIBCOMSTR.py
index 4e348c0..4e03675 100644
--- a/test/RANLIB/RANLIBCOMSTR.py
+++ b/test/RANLIB/RANLIBCOMSTR.py
@@ -35,6 +35,11 @@ python = TestSCons.python
 
 test = TestSCons.TestSCons()
 
+ranlib = test.detect('RANLIB', 'ranlib')
+
+if not ranlib:
+    test.skip_test("Could not find 'ranlib', skipping test.\n")
+
 
 
 test.write('myar.py', """