summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorWilliam Blevins <wblevins@gmail.com>2014-08-28 01:14:22 (GMT)
committerWilliam Blevins <wblevins@gmail.com>2014-08-28 01:14:22 (GMT)
commitade8f8c0aa199049d46d2b19a73964d9fd3c78ef (patch)
tree8ea621760a9236a5ac1fc66e88f25d9944d027f5 /test
parent0da747281aa70058b5637a4ebd6c121858419e95 (diff)
downloadSCons-ade8f8c0aa199049d46d2b19a73964d9fd3c78ef.zip
SCons-ade8f8c0aa199049d46d2b19a73964d9fd3c78ef.tar.gz
SCons-ade8f8c0aa199049d46d2b19a73964d9fd3c78ef.tar.bz2
Issue 2395: Updated tests to be skipped on systems without os.symlink functionality.
Apparently, the SConsTest.symlink behavior doesn't give any success/fail feedback.
Diffstat (limited to 'test')
-rw-r--r--test/Copy-Symlinks.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/Copy-Symlinks.py b/test/Copy-Symlinks.py
index f8f92d7..35e4aa0 100644
--- a/test/Copy-Symlinks.py
+++ b/test/Copy-Symlinks.py
@@ -36,6 +36,9 @@ import TestSCons
import SCons.Defaults
SCons.Defaults.DefaultEnvironment( tools = [] )
+if not hasattr(os, 'symlink'):
+ test.skip_test('No os.symlink() method, no symlinks to test.\n')
+
test = TestSCons.TestSCons()
filelinkToCopy = 'filelinkToCopy'
@@ -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 )