Fix scons-time tests. Remove subversion test

7 files changed, 9 insertions, 89 deletions

diff --git a/bin/scons-time.py b/scripts/scons-time.py
index e4dd863..6494349 100644
--- a/bin/scons-time.py
+++ b/scripts/scons-time.py
@@ -1220,7 +1220,7 @@ class SConsTimer(object):
         return result
 
     def scons_path(self, dir):
-        return os.path.join(dir, 'src', 'script', 'scons.py')
+        return os.path.join(dir,'scripts', 'scons.py')
 
     def scons_lib_dir_path(self, dir):
         return os.path.join(dir, 'src', 'engine')
diff --git a/test/scons-time/run/archive/dir.py b/test/scons-time/run/archive/dir.py
index 590d568..6b6d992 100644
--- a/test/scons-time/run/archive/dir.py
+++ b/test/scons-time/run/archive/dir.py
@@ -32,6 +32,7 @@ directory tree.
 import TestSCons_time
 
 test = TestSCons_time.TestSCons_time()
+test.verbose_set(1)
 
 test.write_fake_scons_py()
 
diff --git a/test/scons-time/run/config/targets.py b/test/scons-time/run/config/targets.py
index 482a44d..1712b32 100644
--- a/test/scons-time/run/config/targets.py
+++ b/test/scons-time/run/config/targets.py
@@ -45,7 +45,7 @@ targets = 'target1 target2'
 
 test.run(arguments = 'run -f config foo.tar.gz')
 
-scons_py    = re.escape(test.workpath('src', 'script', 'scons.py'))
+scons_py = re.escape(test.workpath('scripts', 'scons.py'))
 src_engine  = re.escape(test.workpath('src', 'engine'))
 
 prof1       = re.escape(test.workpath('foo-000-1.prof'))
diff --git a/test/scons-time/run/option/quiet.py b/test/scons-time/run/option/quiet.py
index 2910e8e..0f6c22b 100644
--- a/test/scons-time/run/option/quiet.py
+++ b/test/scons-time/run/option/quiet.py
@@ -37,7 +37,7 @@ python = TestSCons_time.python
 test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re,
                                      diff = TestSCons_time.diff_re)
 
-scons_py = re.escape(test.workpath('src', 'script', 'scons.py'))
+scons_py = re.escape(test.workpath('scripts', 'scons.py'))
 src_engine = re.escape(test.workpath('src', 'engine'))
 
 tmp_scons_time = test.tempdir_re()
diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py
index 6f8f72f..9c4e7e8 100644
--- a/test/scons-time/run/option/verbose.py
+++ b/test/scons-time/run/option/verbose.py
@@ -39,7 +39,7 @@ _python_ = re.escape('"' + sys.executable + '"')
 test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re,
                                      diff = TestSCons_time.diff_re)
 
-scons_py = re.escape(test.workpath('src', 'script', 'scons.py'))
+scons_py = re.escape(test.workpath('scripts', 'scons.py'))
 src_engine = re.escape(test.workpath('src', 'engine'))
 
 tmp_scons_time = test.tempdir_re()
diff --git a/test/scons-time/run/subversion.py b/test/scons-time/run/subversion.py
deleted file mode 100644
index f895760..0000000
--- a/test/scons-time/run/subversion.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify ability to "check out" an SCons revision from a fake
-Subversion utility.
-"""
-
-import re
-import tempfile
-
-import TestSCons_time
-
-test = TestSCons_time.TestSCons_time()
-
-test.write_sample_project('foo.tar')
-
-_python_ = TestSCons_time._python_
-my_svn_py = test.write_fake_svn_py('my_svn.py')
-
-test.write('config', """\
-svn = r'%(_python_)s %(my_svn_py)s'
-""" % locals())
-
-test.run(arguments = 'run -f config --svn http://xyzzy --number 617,716 foo.tar')
-
-test.must_exist('foo-617-0.log',
-                'foo-617-0.prof',
-                'foo-617-1.log',
-                'foo-617-1.prof',
-                'foo-617-2.log',
-                'foo-617-2.prof')
-
-test.must_exist('foo-716-0.log',
-                'foo-716-0.prof',
-                'foo-716-1.log',
-                'foo-716-1.prof',
-                'foo-716-2.log',
-                'foo-716-2.prof')
-
-expect = [
-    test.tempdir_re('src', 'script', 'scons.py'),
-    'SCONS_LIB_DIR = %s' % test.tempdir_re('src', 'engine'),
-]
-
-content = test.read(test.workpath('foo-617-2.log'), mode='r')
-
-def re_find(content, line):
-    return re.search(line, content)
-test.must_contain_all_lines(content, expect, 'foo-617-2.log', re_find)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/testing/framework/TestSCons_time.py b/testing/framework/TestSCons_time.py
index 6f46e26..c6373eb 100644
--- a/testing/framework/TestSCons_time.py
+++ b/testing/framework/TestSCons_time.py
@@ -60,7 +60,7 @@ import os
 import sys
 
 dir = sys.argv[-1]
-script_dir = dir + '/src/script'
+script_dir = dir + '/scripts'
 os.makedirs(script_dir)
 with open(script_dir + '/scons.py', 'w') as f:
     f.write(r'''%s''')
@@ -73,7 +73,7 @@ import os
 import sys
 
 dir = sys.argv[-1]
-script_dir = dir + '/src/script'
+script_dir = dir + '/scripts'
 os.makedirs(script_dir)
 with open(script_dir + '/scons.py', 'w') as f:
     f.write(r'''%s''')
@@ -230,8 +230,8 @@ class TestSCons_time(TestCommon):
         return x
 
     def write_fake_scons_py(self):
-        self.subdir('src', ['src', 'script'])
-        self.write('src/script/scons.py', scons_py)
+        self.subdir('scripts')
+        self.write('scripts/scons.py', scons_py)
 
     def write_fake_svn_py(self, name):
         name = self.workpath(name)