Test improvement. (Kevin Quick)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1112 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/midl.py b/test/midl.py
index a0ff5dd1c3568cc2545fa40d2777bb9baf0448fc..cf800449c528ea933bd469ca12c77a02adb10a8f 100644 (file)
--- a/test/midl.py
+++ b/test/midl.py
@@ -379,66 +379,66 @@ test.write('src/resource.h','''
 
 test.run(arguments=os.path.join('build','bar.dll'))
 
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','BarPCH.pch'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','BarPCH.obj'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.tlb'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.h'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar_i.c'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar_p.c'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar_data.c'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','BarObject.obj'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.obj'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.res'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.dll'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.lib'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build','bar.exp'))))
+test.must_exist(['build','BarPCH.pch'])
+test.must_exist(['build','BarPCH.obj'])
+test.must_exist(['build','bar.tlb'])
+test.must_exist(['build','bar.h'])
+test.must_exist(['build','bar_i.c'])
+test.must_exist(['build','bar_p.c'])
+test.must_exist(['build','bar_data.c'])
+test.must_exist(['build','BarObject.obj'])
+test.must_exist(['build','bar.obj'])
+test.must_exist(['build','bar.res'])
+test.must_exist(['build','bar.dll'])
+test.must_exist(['build','bar.lib'])
+test.must_exist(['build','bar.exp'])
 
 test.run(arguments='-c .')
 
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','BarPCH.pch'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','BarPCH.obj'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.tlb'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.h'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar_i.c'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar_p.c'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar_data.c'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','BarObject.obj'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.obj'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.res'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.dll'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.lib'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build','bar.exp'))))
+test.must_not_exist(['build','BarPCH.pch'])
+test.must_not_exist(['build','BarPCH.obj'])
+test.must_not_exist(['build','bar.tlb'])
+test.must_not_exist(['build','bar.h'])
+test.must_not_exist(['build','bar_i.c'])
+test.must_not_exist(['build','bar_p.c'])
+test.must_not_exist(['build','bar_data.c'])
+test.must_not_exist(['build','BarObject.obj'])
+test.must_not_exist(['build','bar.obj'])
+test.must_not_exist(['build','bar.res'])
+test.must_not_exist(['build','bar.dll'])
+test.must_not_exist(['build','bar.lib'])
+test.must_not_exist(['build','bar.exp'])
 
 test.run(arguments=os.path.join('build2','bar.dll'))
 
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','BarPCH.pch'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','BarPCH.obj'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.tlb'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.h'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar_i.c'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar_p.c'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar_data.c'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','BarObject.obj'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.obj'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.res'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.dll'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.lib'))))
-test.fail_test(not os.path.exists(test.workpath(os.path.join('build2','bar.exp'))))
+test.must_exist(['build2','BarPCH.pch'])
+test.must_exist(['build2','BarPCH.obj'])
+test.must_exist(['build2','bar.tlb'])
+test.must_exist(['build2','bar.h'])
+test.must_exist(['build2','bar_i.c'])
+test.must_exist(['build2','bar_p.c'])
+test.must_exist(['build2','bar_data.c'])
+test.must_exist(['build2','BarObject.obj'])
+test.must_exist(['build2','bar.obj'])
+test.must_exist(['build2','bar.res'])
+test.must_exist(['build2','bar.dll'])
+test.must_exist(['build2','bar.lib'])
+test.must_exist(['build2','bar.exp'])
 
 test.run(arguments='-c .')
 
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','BarPCH.pch'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','BarPCH.obj'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.tlb'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.h'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar_i.c'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar_p.c'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar_data.c'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','BarObject.obj'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.obj'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.res'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.dll'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.lib'))))
-test.fail_test(os.path.exists(test.workpath(os.path.join('build2','bar.exp'))))
+test.must_not_exist(['build2','BarPCH.pch'])
+test.must_not_exist(['build2','BarPCH.obj'])
+test.must_not_exist(['build2','bar.tlb'])
+test.must_not_exist(['build2','bar.h'])
+test.must_not_exist(['build2','bar_i.c'])
+test.must_not_exist(['build2','bar_p.c'])
+test.must_not_exist(['build2','bar_data.c'])
+test.must_not_exist(['build2','BarObject.obj'])
+test.must_not_exist(['build2','bar.obj'])
+test.must_not_exist(['build2','bar.res'])
+test.must_not_exist(['build2','bar.dll'])
+test.must_not_exist(['build2','bar.lib'])
+test.must_not_exist(['build2','bar.exp'])
 
 test.pass_test()