diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-18 09:43:23 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-18 18:25:29 (GMT) |
commit | 76d1c995e5bce542c5aa22e7bbf8a012fd5cb50e (patch) | |
tree | 0353c925889549b45f8017987bb8ea9eb7dbe660 /tests | |
parent | 4583ab15437c7744e8f08adafa1baccec238c1fa (diff) | |
download | Qt-76d1c995e5bce542c5aa22e7bbf8a012fd5cb50e.zip Qt-76d1c995e5bce542c5aa22e7bbf8a012fd5cb50e.tar.gz Qt-76d1c995e5bce542c5aa22e7bbf8a012fd5cb50e.tar.bz2 |
create missing output directories for substituted files
it wasn't the fault of fileFixify() after all ...
Reviewed-by: joerg
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qmake/testdata/substitutes/test.pro | 3 | ||||
-rw-r--r-- | tests/auto/qmake/tst_qmake.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/qmake/testdata/substitutes/test.pro b/tests/auto/qmake/testdata/substitutes/test.pro index 5bce312..ddad93f 100644 --- a/tests/auto/qmake/testdata/substitutes/test.pro +++ b/tests/auto/qmake/testdata/substitutes/test.pro @@ -1,2 +1 @@ -QMAKE_SUBSTITUTES += test.in -# doesn't work for the time being: sub/test2.in +QMAKE_SUBSTITUTES += test.in sub/test2.in diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp index 1a3f843..060fa01 100644 --- a/tests/auto/qmake/tst_qmake.cpp +++ b/tests/auto/qmake/tst_qmake.cpp @@ -483,13 +483,13 @@ void tst_qmake::substitutes() QString workDir = base_path + "/testdata/substitutes"; QVERIFY( test_compiler.qmake( workDir, "test" )); QVERIFY( test_compiler.exists( workDir, "test", Plain, "" )); - //QVERIFY( test_compiler.exists( workDir, "sub/test2", Plain, "" )); + QVERIFY( test_compiler.exists( workDir, "sub/test2", Plain, "" )); 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", Plain, "" )); - //QVERIFY( test_compiler.exists( buildDir, "sub/test2", Plain, "" )); + QVERIFY( test_compiler.exists( buildDir, "sub/test2", Plain, "" )); QVERIFY( test_compiler.makeDistClean( buildDir )); } |