From 3460931829a56a63ee077d126e051032cf5aedef Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Thu, 18 Sep 2014 20:27:56 +0200 Subject: - fixed Java test for derived sources problem, now favouring skip() over no_result() --- test/Java/DerivedSourceTest.py | 8 ++++---- 1 file 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'], """ -- cgit v0.12