diff options
| author | Steven Knight <knight@baldmt.com> | 2005-11-06 15:03:10 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-11-06 15:03:10 (GMT) |
| commit | 0113b86def554ddcd54b3b9eace409e16bf8a5a7 (patch) | |
| tree | cba9b80d7e152fb5724474ed9057f7478482adf0 /test | |
| parent | 65b2ec6b93efcb9947fb90126dfb6d00748769e8 (diff) | |
| download | SCons-0113b86def554ddcd54b3b9eace409e16bf8a5a7.zip SCons-0113b86def554ddcd54b3b9eace409e16bf8a5a7.tar.gz SCons-0113b86def554ddcd54b3b9eace409e16bf8a5a7.tar.bz2 | |
Add support for an explicit SCONS_HOME variable for writing the SCons execution line in Visual Studio project files. (Dobes Vandermeer) Two minor test fixes for win32 portability.
Diffstat (limited to 'test')
| -rw-r--r-- | test/QT/generated-ui.py | 6 | ||||
| -rw-r--r-- | test/rebuild-generated.py | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/test/QT/generated-ui.py b/test/QT/generated-ui.py index 1674487..7125dd9 100644 --- a/test/QT/generated-ui.py +++ b/test/QT/generated-ui.py @@ -28,10 +28,16 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test that the UI scanning logic correctly picks up scansG """ +import os + import TestSCons test = TestSCons.TestSCons() +if not os.environ.get('QTDIR', None): + x ="External environment variable $QTDIR not set; skipping test(s).\n" + test.skip_test(x) + test.subdir(['layer'], ['layer', 'aclock'], ['layer', 'aclock', 'qt_bug']) diff --git a/test/rebuild-generated.py b/test/rebuild-generated.py index 03acf6d..973fc8f 100644 --- a/test/rebuild-generated.py +++ b/test/rebuild-generated.py @@ -50,6 +50,7 @@ without arguments. This may be a duplicate to bug 1019683. """ +import os import sys import TestSCons @@ -83,11 +84,11 @@ kernelImporter = env.Program( kernelImports = env.Command( "KernelImport.hh", kernelImporter, - "./$SOURCE > $TARGET") + ".%s$SOURCE > $TARGET") osLinuxModule = env.StaticObject( ["target.cc"]) -""" % (generator_name, kernel_action)) +""" % (generator_name, kernel_action, os.sep)) test.write('main.cc', """\ int |