diff options
author | Dirk Baechle <dl9obn@darc.de> | 2014-09-18 20:27:56 +0200 |
---|---|---|
committer | Dirk Baechle <dl9obn@darc.de> | 2014-09-18 20:27:56 +0200 |
commit | c589e32384fe5d8879515b9728d147968fa5b0c0 (patch) | |
tree | 4c454a678309803eb2d34b9d2cf14c8a218dcc74 | |
parent | 00016ef27519748117066aab541e164b72b60fc1 (diff) | |
download | scons-c589e32384fe5d8879515b9728d147968fa5b0c0.tar.gz |
- fixed Java test for derived sources problem, now favouring skip()
over no_result()
-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 c749cf36..7f805951 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'], """ |