Some more fixups for project directory moves

Signed-off-by: Mats Wichmann <mats@linux.com>

3 files changed, 22 insertions, 35 deletions

diff --git a/test/scons-time/run/config/targets.py b/test/scons-time/run/config/targets.py
index 1712b32..5770713 100644
--- a/test/scons-time/run/config/targets.py
+++ b/test/scons-time/run/config/targets.py
@@ -22,18 +22,18 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 """
 Verify specifying a list of targets through a config file.
 """
 
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
 import os
 import re
 
 import TestSCons_time
 
-test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re)
+test = TestSCons_time.TestSCons_time(match=TestSCons_time.match_re)
 
 test.write_fake_scons_py()
 
@@ -46,12 +46,12 @@ targets = 'target1 target2'
 test.run(arguments = 'run -f config foo.tar.gz')
 
 scons_py = re.escape(test.workpath('scripts', 'scons.py'))
-src_engine  = re.escape(test.workpath('src', 'engine'))
+src_engine = re.escape(test.workpath())
 
-prof1       = re.escape(test.workpath('foo-000-1.prof'))
-prof2       = re.escape(test.workpath('foo-000-2.prof'))
+prof1 = re.escape(test.workpath('foo-000-1.prof'))
+prof2 = re.escape(test.workpath('foo-000-2.prof'))
 
-sep         = re.escape(os.sep)
+sep = re.escape(os.sep)
 
 expect = """\
 %(scons_py)s
diff --git a/test/scons-time/run/option/quiet.py b/test/scons-time/run/option/quiet.py
index 0f6c22b..f3f2a27 100644
--- a/test/scons-time/run/option/quiet.py
+++ b/test/scons-time/run/option/quiet.py
@@ -22,23 +22,23 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 """
 Verify that the run -q and --quiet options suppress build output.
 """
 
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
 import re
 
 import TestSCons_time
 
 python = TestSCons_time.python
 
-test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re,
-                                     diff = TestSCons_time.diff_re)
+test = TestSCons_time.TestSCons_time(match=TestSCons_time.match_re,
+                                     diff=TestSCons_time.diff_re)
 
 scons_py = re.escape(test.workpath('scripts', 'scons.py'))
-src_engine = re.escape(test.workpath('src', 'engine'))
+src_engine = re.escape(test.workpath())
 
 tmp_scons_time = test.tempdir_re()
 tmp_scons_time_foo = test.tempdir_re('foo')
@@ -55,7 +55,7 @@ SCONS_LIB_DIR = %(src_engine)s
 SConstruct file directory: %(tmp_scons_time_foo)s
 """ % locals()
 
-test.run(arguments = 'run -q foo.tar.gz', stdout = expect)
+test.run(arguments='run -q foo.tar.gz', stdout=expect)
 
 test.must_exist('foo-000-0.log',
                 'foo-000-0.prof',
@@ -64,20 +64,7 @@ test.must_exist('foo-000-0.log',
                 'foo-000-2.log',
                 'foo-000-2.prof')
 
-scons_py = test.workpath('src/script/scons.py')
-
-src_engine = test.workpath('src/engine')
-
-test.run(arguments = 'run -q foo.tar.gz', stdout = expect)
-
-test.must_exist('foo-001-0.log',
-                'foo-001-0.prof',
-                'foo-001-1.log',
-                'foo-001-1.prof',
-                'foo-001-2.log',
-                'foo-001-2.prof')
-
-test.run(arguments = 'run --quiet foo.tar.gz', stdout = expect)
+test.run(arguments='run --quiet foo.tar.gz', stdout=expect)
 
 test.pass_test()
 
diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py
index 9c4e7e8..bf8d48f 100644
--- a/test/scons-time/run/option/verbose.py
+++ b/test/scons-time/run/option/verbose.py
@@ -22,12 +22,12 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 """
 Verify that the run -v and --verbose options display command output.
 """
 
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
 import sys
 import re
 import os
@@ -36,11 +36,11 @@ import TestSCons_time
 _python_ = re.escape('"' + sys.executable + '"')
 
 
-test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re,
-                                     diff = TestSCons_time.diff_re)
+test = TestSCons_time.TestSCons_time(match=TestSCons_time.match_re,
+                                     diff=TestSCons_time.diff_re)
 
 scons_py = re.escape(test.workpath('scripts', 'scons.py'))
-src_engine = re.escape(test.workpath('src', 'engine'))
+src_engine = re.escape(test.workpath())
 
 tmp_scons_time = test.tempdir_re()
 tmp_scons_time_foo = test.tempdir_re('foo')
@@ -57,7 +57,7 @@ SCONS_LIB_DIR = %(src_engine)s
 SConstruct file directory: %(tmp_scons_time_foo)s
 """ % locals()
 
-test.run(arguments = 'run -q foo.tar.gz', stdout = expect)
+test.run(arguments='run -q foo.tar.gz', stdout=expect)
 
 test.must_exist('foo-000-0.log',
                 'foo-000-0.prof',
@@ -126,7 +126,7 @@ prof0 = re.escape(test.workpath('foo-001-0.prof'))
 prof1 = re.escape(test.workpath('foo-001-1.prof'))
 prof2 = re.escape(test.workpath('foo-001-2.prof'))
 
-test.run(arguments = 'run -v foo.tar.gz', stdout = expect % locals())
+test.run(arguments='run -v foo.tar.gz', stdout=expect % locals())
 
 test.must_exist('foo-001-0.log',
                 'foo-001-0.prof',
@@ -143,7 +143,7 @@ prof0 = re.escape(test.workpath('foo-002-0.prof'))
 prof1 = re.escape(test.workpath('foo-002-1.prof'))
 prof2 = re.escape(test.workpath('foo-002-2.prof'))
 
-test.run(arguments = 'run --verbose foo.tar.gz', stdout = expect % locals())
+test.run(arguments='run --verbose foo.tar.gz', stdout=expect % locals())
 
 
 test.pass_test()