From e40095250c8bbe04a11c6db42833f9653b304b91 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 21 Mar 2005 12:12:06 +0000 Subject: [PATCH] Fix test/emitter.py for new entry matching. git-svn-id: http://scons.tigris.org/svn/scons/trunk@1263 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- test/emitter.py | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/test/emitter.py b/test/emitter.py index 0bdc619e..ebe230ea 100644 --- a/test/emitter.py +++ b/test/emitter.py @@ -66,30 +66,37 @@ test.write(['src', 'f.in'], 'f.in') test.write(['src', 'g.in'], 'g.in') test.write(['src', 'h.in'], 'h.in') -test.run(arguments='.') +# Do 'src' last so that creation of the emitter files in there doesn't +# interfere with searching for them in the BuildDirs. + +test.run(arguments='var2') -test.must_exist(test.workpath('src', 'f.out')) -test.must_exist(test.workpath('src', 'f.out.foo')) -test.must_exist(test.workpath('var1', 'f.out')) -test.must_exist(test.workpath('var1', 'f.out.foo')) test.must_exist(test.workpath('var2', 'f.out')) test.must_exist(test.workpath('var2', 'f.out.foo')) +test.must_exist(test.workpath('var2', 'g.out')) +test.must_exist(test.workpath('var2', 'g.out.foo')) +test.must_exist(test.workpath('var2', 'h.out')) +test.must_exist(test.workpath('var2', 'emit.1')) +test.must_exist(test.workpath('var2', 'emit.2')) -test.must_exist(test.workpath('src', 'g.out')) -test.must_exist(test.workpath('src', 'g.out.foo')) +test.run(arguments = 'var1') + +test.must_exist(test.workpath('var1', 'f.out')) +test.must_exist(test.workpath('var1', 'f.out.foo')) test.must_exist(test.workpath('var1', 'g.out')) test.must_exist(test.workpath('var1', 'g.out.foo')) -test.must_exist(test.workpath('var2', 'g.out')) -test.must_exist(test.workpath('var2', 'g.out.foo')) +test.must_exist(test.workpath('var1', 'h.out')) +test.must_exist(test.workpath('var1', 'emit.1')) +test.must_exist(test.workpath('var1', 'emit.2')) +test.run(arguments = 'src') + +test.must_exist(test.workpath('src', 'f.out')) +test.must_exist(test.workpath('src', 'f.out.foo')) +test.must_exist(test.workpath('src', 'g.out')) +test.must_exist(test.workpath('src', 'g.out.foo')) test.must_exist(test.workpath('src', 'h.out')) test.must_exist(test.workpath('src', 'emit.1')) test.must_exist(test.workpath('src', 'emit.2')) -test.must_exist(test.workpath('var1', 'h.out')) -test.must_exist(test.workpath('var1', 'emit.1')) -test.must_exist(test.workpath('var1', 'emit.2')) -test.must_exist(test.workpath('var2', 'h.out')) -test.must_exist(test.workpath('var2', 'emit.1')) -test.must_exist(test.workpath('var2', 'emit.2')) test.pass_test() -- 2.26.2