summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake/tst_qmake.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-12 17:47:41 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-17 11:34:30 (GMT)
commit63434c07fbe4e3d8735a9e28200ce9b3b121bec8 (patch)
tree78df0fc26c49814600e9ebef1272e60c3951a456 /tests/auto/qmake/tst_qmake.cpp
parent6de735b5793aa1c5ddcba65b1110d3f9e1c64d1d (diff)
downloadQt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.zip
Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.tar.gz
Qt-63434c07fbe4e3d8735a9e28200ce9b3b121bec8.tar.bz2
fix QMAKE_SUBSTITUTES with shadow builds
still doesn't work for nested directories, but that's because fileFixify() is plain broken. on the way, remove a superfluous check: we know that the input file name ends with .in - three lines up we made sure it does. Reviewed-by: joerg
Diffstat (limited to 'tests/auto/qmake/tst_qmake.cpp')
-rw-r--r--tests/auto/qmake/tst_qmake.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 5efe714..825e49b 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -90,6 +90,7 @@ private slots:
void bundle_spaces();
#endif
void includefunction();
+ void substitutes();
private:
TestCompiler test_compiler;
@@ -477,6 +478,21 @@ void tst_qmake::includefunction()
QVERIFY(test_compiler.commandOutput().contains(warningMsg));
}
+void tst_qmake::substitutes()
+{
+ QString workDir = base_path + "/testdata/substitutes";
+ QVERIFY( test_compiler.qmake( workDir, "test" ));
+ QVERIFY( test_compiler.exists( workDir, "test", Exe, "1.0.0" ));
+ //QVERIFY( test_compiler.exists( workDir, "sub/test2", Exe, "1.0.0" ));
+ QVERIFY( test_compiler.makeDistClean( workDir ));
+
+ QString buildDir = base_path + "/testdata/substitutes_build";
+ QVERIFY( test_compiler.qmake( workDir, "test", buildDir ));
+ QVERIFY( test_compiler.exists( buildDir, "test", Exe, "1.0.0" ));
+ //QVERIFY( test_compiler.exists( buildDir, "sub/test2", Exe, "1.0.0" ));
+ QVERIFY( test_compiler.makeDistClean( buildDir ));
+}
+
QTEST_MAIN(tst_qmake)
#include "tst_qmake.moc"