Add -k support and more

1 files changed, 11 insertions, 7 deletions

diff --git a/test/option-k.py b/test/option-k.py
index 4034d831..edf7be1a 100644
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -32,8 +32,6 @@ python = sys.executable
 
 test = TestSCons.TestSCons()
 
-test.pass_test()	#XXX Short-circuit until this is supported.
-
 test.write('succeed.py', r"""
 import sys
 file = open(sys.argv[1], 'wb')
@@ -56,25 +54,31 @@ env.Succeed(target = 'aaa.out', source = 'aaa.1')
 env.Succeed(target = 'bbb.out', source = 'bbb.in')
 """ % (python, python))
 
-test.run(arguments = '.')
+test.run(arguments = 'aaa.out bbb.out',
+         stderr =
+         'scons: *** [aaa.1] Error 1\n')
 
 test.fail_test(os.path.exists(test.workpath('aaa.1')))
 test.fail_test(os.path.exists(test.workpath('aaa.out')))
 test.fail_test(os.path.exists(test.workpath('bbb.out')))
 
-test.run(arguments = '-k .')
+test.run(arguments = '-k aaa.out bbb.out',
+         stderr =
+         'scons: *** [aaa.1] Error 1\n')
 
 test.fail_test(os.path.exists(test.workpath('aaa.1')))
 test.fail_test(os.path.exists(test.workpath('aaa.out')))
-test.fail_test(test.read('bbb.out') != "bbb.out\n")
+test.fail_test(test.read('bbb.out') != "succeed.py: bbb.out\n")
 
 test.unlink("bbb.out")
 
-test.run(arguments = '--keep-going .')
+test.run(arguments = '--keep-going aaa.out bbb.out',
+         stderr =
+         'scons: *** [aaa.1] Error 1\n')
 
 test.fail_test(os.path.exists(test.workpath('aaa.1')))
 test.fail_test(os.path.exists(test.workpath('aaa.out')))
-test.fail_test(test.read('bbb.out') != "bbb.out\n")
+test.fail_test(test.read('bbb.out') != "succeed.py: bbb.out\n")
 
 test.pass_test()