diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-25 11:20:02 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-25 10:01:58 +0000 |
| commit | 667ecf6542e0b98ea8bbba43d59e95007b14b60d (patch) | |
| tree | 3a18e8a096811bd57a1613bc8b5ef07855db5463 /tests | |
| parent | 89898873ee9171c0f11cc872347a0ae08153d728 (diff) | |
Fix running the test suite on Windows
By "accident" it appears that the files in the submodule have \n
line-endings in the CI. However in a regular developer checkout, the
YAML test harness config file has \r\n endings and that requires fixing
before attempting to parse the YAML.
Change-Id: I98bba1864433d5b44741dd7863125b13ae7b58de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp b/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp index d2d389305a..2a14bdb463 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp +++ b/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp @@ -610,6 +610,7 @@ TestData Test262Runner::getTestData(const TestCase &testCase) exit(1); } QByteArray content = testFile.readAll(); + content.replace(QByteArrayLiteral("\r\n"), "\n"); // qDebug() << "parsing test file" << test; |