diff options
Diffstat (limited to 'test/QT')
| -rw-r--r-- | test/QT/QTFLAGS.py | 4 | ||||
| -rw-r--r-- | test/QT/installed.py | 2 | ||||
| -rw-r--r-- | test/QT/moc-from-cpp.py | 6 | ||||
| -rw-r--r-- | test/QT/moc-from-header.py | 6 | ||||
| -rw-r--r-- | test/QT/source-from-ui.py | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py index ba08739..5656b08 100644 --- a/test/QT/QTFLAGS.py +++ b/test/QT/QTFLAGS.py @@ -134,12 +134,12 @@ env = Environment(QTDIR = r'%s', QT_UIC = r'%s', %s tools=['default','qt']) -if ARGUMENTS.get('build_dir', 0): +if ARGUMENTS.get('variant_dir', 0): if ARGUMENTS.get('chdir', 0): SConscriptChdir(1) else: SConscriptChdir(0) - BuildDir('build', '.', duplicate=1) + VariantDir('build', '.', duplicate=1) sconscript = Dir('build').File('SConscript') else: sconscript = File('SConscript') diff --git a/test/QT/installed.py b/test/QT/installed.py index d746d9e..25e8b91 100644 --- a/test/QT/installed.py +++ b/test/QT/installed.py @@ -73,7 +73,7 @@ if not conf.CheckLib(env.subst("$QT_LIB"), autoadd=0): if not conf.CheckLib(env.subst("$QT_LIB"), autoadd=0): Exit(0) env = conf.Finish() -BuildDir('bld', '.') +VariantDir('bld', '.') env.Program('bld/test_realqt', ['bld/mocFromCpp.cpp', 'bld/mocFromH.cpp', 'bld/anUiFile.ui', diff --git a/test/QT/moc-from-cpp.py b/test/QT/moc-from-cpp.py index 359a241..1936a72 100644 --- a/test/QT/moc-from-cpp.py +++ b/test/QT/moc-from-cpp.py @@ -81,15 +81,15 @@ test.not_up_to_date(options = '-n', arguments = moc) test.run(options = '-c', arguments = lib_aaa) -test.run(arguments = "build_dir=1 " + test.workpath('build', lib_aaa), +test.run(arguments = "variant_dir=1 " + test.workpath('build', lib_aaa), stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) -test.run(arguments = "build_dir=1 chdir=1 " + test.workpath('build', lib_aaa)) +test.run(arguments = "variant_dir=1 chdir=1 " + test.workpath('build', lib_aaa)) test.must_exist(test.workpath('build', moc)) -test.run(arguments = "build_dir=1 dup=0 " + +test.run(arguments = "variant_dir=1 dup=0 " + test.workpath('build_dup0', lib_aaa), stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) diff --git a/test/QT/moc-from-header.py b/test/QT/moc-from-header.py index 9936490..102facc 100644 --- a/test/QT/moc-from-header.py +++ b/test/QT/moc-from-header.py @@ -85,13 +85,13 @@ test.not_up_to_date(options='-n', arguments = moc) test.run(program = test.workpath(aaa_exe), stdout = 'aaa.h\n') -test.run(arguments = "build_dir=1 " + build_aaa_exe) +test.run(arguments = "variant_dir=1 " + build_aaa_exe) -test.run(arguments = "build_dir=1 chdir=1 " + build_aaa_exe) +test.run(arguments = "variant_dir=1 chdir=1 " + build_aaa_exe) test.must_exist(test.workpath('build', moc)) -test.run(arguments = "build_dir=1 chdir=1 dup=0 " + +test.run(arguments = "variant_dir=1 chdir=1 dup=0 " + test.workpath('build_dup0', aaa_exe) ) test.must_exist(['build_dup0', moc]) diff --git a/test/QT/source-from-ui.py b/test/QT/source-from-ui.py index 9ffe0aa..874285d 100644 --- a/test/QT/source-from-ui.py +++ b/test/QT/source-from-ui.py @@ -115,7 +115,7 @@ test.not_up_to_date(options = '-n', arguments = moc) # clean up test.run(arguments = '-c ' + aaa_dll) -test.run(arguments = "build_dir=1 " + +test.run(arguments = "variant_dir=1 " + test.workpath('build', aaa_dll) ) test.must_exist(test.workpath('build', moc)) @@ -128,7 +128,7 @@ test.must_not_exist(test.workpath(h)) cppContents = test.read(test.workpath('build', cpp)) test.fail_test(string.find(cppContents, '#include "aaa.ui.h"') == -1) -test.run(arguments = "build_dir=1 chdir=1 " + +test.run(arguments = "variant_dir=1 chdir=1 " + test.workpath('build', aaa_dll) ) test.must_exist(test.workpath('build', moc)) @@ -138,7 +138,7 @@ test.must_not_exist(test.workpath(moc)) test.must_not_exist(test.workpath(cpp)) test.must_not_exist(test.workpath(h)) -test.run(arguments = "build_dir=1 chdir=1 dup=0 " + +test.run(arguments = "variant_dir=1 chdir=1 dup=0 " + test.workpath('build_dup0', aaa_dll) ) test.must_exist(test.workpath('build_dup0',moc)) |