diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-18 18:55:25 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-23 18:53:43 +0000 |
commit | 21968aed886e45c0514a2b770bc678c07a204d89 (patch) | |
tree | 1b40482172ac70dcadc914f7baab15a51022c957 /tests | |
parent | b8724729191957066ce19786d6de9ee9ccf045e8 (diff) |
Fix tests on non-latin systems
Qt Creator uses non-latin letters in path to the build directory in case
of ru_RU.UTF-8 $LANG on Linux. Now QBS does handle that correctly.
Change-Id: Ifc727b120a5f0ee60972c5e3ed24067426db8df2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs | 2 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs index 9dd7bf5b2..0b4de0ab9 100644 --- a/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs +++ b/tests/auto/blackbox/testdata/linkerscripts/linkerscripts.qbs @@ -44,7 +44,7 @@ DynamicLibrary { cmd.sourceCode = function() { var file = new TextFile(buildPath + "/linkerscript_with_includes", TextFile.WriteOnly); - file.write("SEARCH_DIR(" + sourcePath + "/scripts)\n" + + file.write("SEARCH_DIR(\"" + sourcePath + "/scripts\")\n" + "INCLUDE linkerscript_to_include\n" + "INCLUDE linkerscript_in_directory\n"); file.close(); diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 219a473e0..399a49b21 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2537,6 +2537,9 @@ void TestBlackbox::smartRelinking_data() static QString soName(const QString &readElfPath, const QString &libFilePath) { QProcess readElf; + auto env = QProcessEnvironment::systemEnvironment(); + env.insert(QStringLiteral("LC_ALL"), QStringLiteral("C")); // force readelf to use US encoding + readElf.setProcessEnvironment(env); readElf.start(readElfPath, QStringList() << "-a" << libFilePath); if (!readElf.waitForStarted() || !readElf.waitForFinished() || readElf.exitCode() != 0) { qDebug() << readElf.errorString() << readElf.readAllStandardError(); @@ -2936,7 +2939,7 @@ void TestBlackbox::probeChangeTracking() void TestBlackbox::probeProperties() { QDir::setCurrent(testDataDir + "/probeProperties"); - const QByteArray dir = QDir::cleanPath(testDataDir).toLatin1() + "/probeProperties"; + const QByteArray dir = QDir::cleanPath(testDataDir).toLocal8Bit() + "/probeProperties"; QCOMPARE(runQbs(), 0); QVERIFY2(m_qbsStdout.contains("probe1.fileName=bin/tool"), m_qbsStdout.constData()); QVERIFY2(m_qbsStdout.contains("probe1.path=" + dir), m_qbsStdout.constData()); |