Merged in williamblevins/scons4 (pull request #180, issue 2935)

1 files changed, 7 insertions, 7 deletions

diff --git a/test/Copy-Symlinks.py b/test/Copy-Symlinks.py
index f8f92d74..640e76c1 100644
--- a/test/Copy-Symlinks.py
+++ b/test/Copy-Symlinks.py
@@ -38,6 +38,9 @@ SCons.Defaults.DefaultEnvironment( tools = [] )
 
 test = TestSCons.TestSCons()
 
+if not hasattr(os, 'symlink'):
+    test.skip_test('No os.symlink() method, no symlinks to test.\n')
+
 filelinkToCopy = 'filelinkToCopy'
 fileToLink = 'file.in'
 fileContents = 'stuff n things\n'
@@ -48,13 +51,10 @@ treelinkToCopy = 'treelinkToCopy'
 badToLink = 'None' # do not write this item
 badlinkToCopy = 'badlinkToCopy'
 
-try:
-    test.symlink( fileToLink, filelinkToCopy )
-    test.symlink( dirToLink, dirlinkToCopy )
-    test.symlink( treeToLink, treelinkToCopy )
-    test.symlink( badToLink, badlinkToCopy )
-except:
-    test.no_result()
+test.symlink( fileToLink, filelinkToCopy )
+test.symlink( dirToLink, dirlinkToCopy )
+test.symlink( treeToLink, treelinkToCopy )
+test.symlink( badToLink, badlinkToCopy )
 
 test.write( fileToLink, fileContents )
 test.subdir( dirToLink )