diff options
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 |