Fix runtest.py for new package-testing scheme baseline tests.

3 files changed, 57 insertions, 3 deletions

diff --git a/SConstruct b/SConstruct
index 7b73560..c358cb2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -554,13 +554,20 @@ for p in [ scons ]:
     ])
 
 #
+#
+#
+Export('env')
+
+SConscript('etc/SConscript')
+
+#
 # Documentation.
 #
 BuildDir('build/doc', 'doc')
 
 Export('env', 'whereis')
 
-SConscript('build/doc/SConscript');
+SConscript('build/doc/SConscript')
 
 #
 # If we're running in the actual Aegis project, pack up a complete
diff --git a/etc/SConscript b/etc/SConscript
new file mode 100644
index 0000000..ce835b8
--- /dev/null
+++ b/etc/SConscript
@@ -0,0 +1,45 @@
+#
+# SConscript file for external packages we need.
+#
+
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# 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.
+#
+
+import os.path
+
+Import('env')
+
+files = [
+    'TestCmd.py',
+    'TestSCons.py',
+    'unittest.py',
+]
+
+def copy(target, source, env):
+    print "copy() < %s > %s" % (source[0], target)
+    open(target, 'wb').write(open(source[0], 'rb').read())
+
+for file in files:
+    env.Command(os.path.join('#build', 'etc', file),
+                file,
+		copy)
diff --git a/runtest.py b/runtest.py
index 2344b98..0f2acb6 100644
--- a/runtest.py
+++ b/runtest.py
@@ -55,7 +55,7 @@ else:
     lib_dir = os.path.join(sys.exec_prefix, "lib", "python" + sys.version[0:3])
 
 opts, tests = getopt.getopt(sys.argv[1:], "adqp:",
-			    ['all','build=','debug','quiet','version='])
+			    ['all', 'debug', 'quiet', 'package='])
 
 for o, a in opts:
     if o == '-a' or o == '--all': all = 1
@@ -107,7 +107,9 @@ else:
 
     lib_dir = os.path.join(cwd, 'src', 'engine')
 
-os.environ['PYTHONPATH'] = lib_dir + os.pathsep + os.path.join(cwd, 'etc')
+os.environ['PYTHONPATH'] = lib_dir + \
+                           os.pathsep + \
+                           os.path.join(cwd, 'build', 'etc')
 
 os.chdir(scons_dir)