diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-09-18 18:27:56 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-09-18 18:27:56 (GMT) |
| commit | 3460931829a56a63ee077d126e051032cf5aedef (patch) | |
| tree | 4c454a678309803eb2d34b9d2cf14c8a218dcc74 /test | |
| parent | 31a6b57a62dcbdfcb4b059feb4a9ea93793c3e70 (diff) | |
| download | SCons-3460931829a56a63ee077d126e051032cf5aedef.zip SCons-3460931829a56a63ee077d126e051032cf5aedef.tar.gz SCons-3460931829a56a63ee077d126e051032cf5aedef.tar.bz2 | |
- fixed Java test for derived sources problem, now favouring skip()
over no_result()
Diffstat (limited to 'test')
| -rw-r--r-- | test/Java/DerivedSourceTest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Java/DerivedSourceTest.py b/test/Java/DerivedSourceTest.py index c749cf3..7f80595 100644 --- a/test/Java/DerivedSourceTest.py +++ b/test/Java/DerivedSourceTest.py @@ -45,14 +45,14 @@ SCons.Defaults.DefaultEnvironment(tools = []) test = TestSCons.TestSCons() -# No result if tools not available -test.no_result( condition=(test.where_is( 'javac' ) is None) ) -test.no_result( condition=(test.where_is( 'jar' ) is None) ) - # This test is known to fail as of July 2014; see Tigris issue 1771 and issue 2931. # Once the underlying issue is corrected, this test should be re-enabled. test.skip_test('Skipping derived-source test until issue 1771 is fixed.\n') +# No result if tools not available +test.no_result( condition=(test.where_is( 'javac' ) is None) ) +test.no_result( condition=(test.where_is( 'jar' ) is None) ) + test.write( ['Sample.java'], """ |