diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2012-01-25 16:16:49 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2012-01-26 14:23:35 +0100 |
| commit | c0b51f49962c9f37599a4d5f0570ea3d0f97d12a (patch) | |
| tree | 2fad0a8adf94dab48f0b179af29325371af9f76d | |
| parent | 41cdf21b9914485153711e26f6c88c766d6797dc (diff) | |
Fix LD_LIBRARY_PATH setting for unit tests.
Change-Id: I6399388f62c69548c74e866cb5cd9f2e5b5cb543
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Faure <faure@kde.org>
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro index 12056fc..daa2aa9 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro +++ b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro @@ -30,7 +30,7 @@ contains(QMAKE_CXX, --sysroot): { QMAKE_EXTRA_TARGETS += check check.depends = $$TARGET - check.commands = LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$OUT_PWD/../../../../src/mimetypes ./$$TARGET -xunitxml -o $${TARGET}.xml + check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/mimetypes ./$$TARGET -xunitxml -o $${TARGET}.xml } QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor diff --git a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro index 7acf00b..7b059a1 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro +++ b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro @@ -30,7 +30,7 @@ contains(QMAKE_CXX, --sysroot): { QMAKE_EXTRA_TARGETS += check check.depends = $$TARGET - check.commands = LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$OUT_PWD/../../../../src/mimetypes ./$$TARGET -xunitxml -o $${TARGET}.xml + check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/mimetypes ./$$TARGET -xunitxml -o $${TARGET}.xml } QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor diff --git a/tests/auto/qmimetype/qmimetype.pro b/tests/auto/qmimetype/qmimetype.pro index 552fefe..e1f5835 100644 --- a/tests/auto/qmimetype/qmimetype.pro +++ b/tests/auto/qmimetype/qmimetype.pro @@ -21,7 +21,7 @@ HEADERS += tst_qmimetype.h QMAKE_EXTRA_TARGETS += check check.depends = $$TARGET -check.commands = LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$OUT_PWD/../../../src/mimetypes ./$$TARGET -xunitxml -o $${TARGET}.xml +check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../src/mimetypes ./$$TARGET -xunitxml -o $${TARGET}.xml exists($${TARGET}.xml): { tests_results.files += $${TARGET}.xml |