summaryrefslogtreecommitdiffstats
path: root/test/QT.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/QT.py')
-rw-r--r--test/QT.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/test/QT.py b/test/QT.py
index c5f32fb..4879432 100644
--- a/test/QT.py
+++ b/test/QT.py
@@ -43,7 +43,7 @@ dll_ = TestSCons.dll_
_dll = TestSCons._dll
_shobj = TestSCons._shobj
-test = TestSCons.TestSCons(match=TestSCons.match_re_dotall)
+test = TestSCons.TestSCons()
test.subdir( 'qt', ['qt', 'bin'], ['qt', 'include'], ['qt', 'lib'] )
@@ -127,7 +127,8 @@ env.StaticLibrary( 'myqt', 'my_qobject.cpp' )
""")
test.run(chdir=test.workpath('qt','lib'), arguments = '.',
- stderr=TestSCons.noisy_ar)
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
QT = test.workpath('qt')
QT_LIB = 'myqt'
@@ -311,7 +312,9 @@ void useit() {
}
""")
-test.run(chdir='work3', arguments = lib_aaa, stderr=TestSCons.noisy_ar)
+test.run(chdir='work3', arguments = lib_aaa,
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
test.up_to_date(chdir='work3', options = '-n', arguments = lib_aaa)
test.write(['work3', 'aaa.cpp'], r"""
#include "my_qobject.h"
@@ -324,7 +327,8 @@ test.not_up_to_date(chdir='work3', options = '-n', arguments = moc)
test.run(chdir='work3',
arguments = "build_dir=1 " +
test.workpath('work3', 'build', lib_aaa),
- stderr=TestSCons.noisy_ar )
+ stderr=TestSCons.noisy_ar,
+ match=TestSCons.match_re_dotall)
test.run(chdir='work3',
arguments = "build_dir=1 chdir=1 " +
test.workpath('work3', 'build', lib_aaa) )