diff options
| author | Steven Knight <knight@baldmt.com> | 2010-06-08 06:36:47 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-06-08 06:36:47 (GMT) |
| commit | 02b944eec24378f2382bc7e4ff7b94805934531a (patch) | |
| tree | b3de36cbc0f0b538c6ab72d54f5a9218c64e263b /src/engine | |
| parent | decf967b2105f9d91d1ba285ba28761b2cffbb25 (diff) | |
| download | SCons-02b944eec24378f2382bc7e4ff7b94805934531a.zip SCons-02b944eec24378f2382bc7e4ff7b94805934531a.tar.gz SCons-02b944eec24378f2382bc7e4ff7b94805934531a.tar.bz2 | |
Test fixes for Solaris, notably making test/Actions/function.py print
intermediate messages to avoid buildbot hangs.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/ActionTests.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index ae909a8..02407cc 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -1128,6 +1128,10 @@ class CommandActionTestCase(unittest.TestCase): # Newer cygwin seems to return 126 for following expect_nonexecutable_file = 126 expect_nonexecutable_dir = 127 + elif sys.platform.find('sunos') != -1: + expect_nonexistent = 1 + expect_nonexecutable_file = 1 + expect_nonexecutable_dir = 1 else: expect_nonexistent = 127 expect_nonexecutable_file = 126 diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 3f70514..ec69607 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -1280,7 +1280,7 @@ env4.builder1.env, env3) env.fs.Repository('/rep1') env.fs.Repository('/rep2') - env.Replace(CPPPATH = [ 'foo', '/a/b', '$FOO/bar', blat], + env.Replace(CPPPATH = [ 'foo', '/__a__/b', '$FOO/bar', blat], INCPREFIX = '-I ', INCSUFFIX = 'XXX', FOO = 'baz') @@ -1289,7 +1289,7 @@ env4.builder1.env, env3) '-I', normalize_path('xx/fooXXX'), '-I', normalize_path('/rep1/xx/fooXXX'), '-I', normalize_path('/rep2/xx/fooXXX'), - '-I', normalize_path('/a/bXXX'), + '-I', normalize_path('/__a__/bXXX'), '-I', normalize_path('xx/baz/barXXX'), '-I', normalize_path('/rep1/xx/baz/barXXX'), '-I', normalize_path('/rep2/xx/baz/barXXX'), |