Merge 0480536 into 7035b61

opencor · Aug 11, 2020 · a5cec12 · a5cec12
2 parents 7035b61 + 0480536
commit a5cec12
Show file tree

Hide file tree

Showing 60 changed files with 754 additions and 9,722 deletions.
diff --git a/cmake/clcachewrapper.c b/cmake/clcachewrapper.c
@@ -43,6 +43,9 @@ int main(int pArgC, char *pArgV[])
             if (pArgV[i][j] == '\\') {
                 clcacheCommand[++k] = '\\';
                 clcacheCommand[++k] = '\\';
+            } else if (pArgV[i][j] == '"') {
+                clcacheCommand[++k] = '\\';
+                clcacheCommand[++k] = '"';
             } else {
                 clcacheCommand[++k] = pArgV[i][j];
             }

diff --git a/src/plugins/editing/CellMLTextView/tests/clitests.cpp b/src/plugins/editing/CellMLTextView/tests/clitests.cpp
@@ -109,7 +109,7 @@ void CliTests::exportTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(CliTests)
+QTEST_APPLESS_MAIN(CliTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/editing/CellMLTextView/tests/conversiontests.cpp b/src/plugins/editing/CellMLTextView/tests/conversiontests.cpp
@@ -771,7 +771,7 @@ void ConversionTests::warningConversionTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(ConversionTests)
+QTEST_APPLESS_MAIN(ConversionTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/editing/CellMLTextView/tests/parsingtests.cpp b/src/plugins/editing/CellMLTextView/tests/parsingtests.cpp
@@ -1959,7 +1959,7 @@ void ParsingTests::mapTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(ParsingTests)
+QTEST_APPLESS_MAIN(ParsingTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/editing/CellMLTextView/tests/scanningtests.cpp b/src/plugins/editing/CellMLTextView/tests/scanningtests.cpp
@@ -818,7 +818,7 @@ void ScanningTests::scanningNumberTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(ScanningTests)
+QTEST_APPLESS_MAIN(ScanningTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/miscellaneous/Compiler/tests/tests.cpp b/src/plugins/miscellaneous/Compiler/tests/tests.cpp
@@ -1063,7 +1063,7 @@ void Tests::lcmFunctionTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/miscellaneous/Core/tests/clitests.cpp b/src/plugins/miscellaneous/Core/tests/clitests.cpp
@@ -149,7 +149,7 @@ void CliTests::cliStatusTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(CliTests)
+QTEST_APPLESS_MAIN(CliTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/miscellaneous/Core/tests/mathmltests.cpp b/src/plugins/miscellaneous/Core/tests/mathmltests.cpp
@@ -284,7 +284,7 @@ void MathmlTests::trigonometricTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(MathmlTests)
+QTEST_APPLESS_MAIN(MathmlTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/PythonSupport/tests/basictests.cpp b/src/plugins/support/PythonSupport/tests/basictests.cpp
@@ -40,12 +40,12 @@ void BasicTests::tests()
     QStringList output;
 
     QVERIFY(!OpenCOR::runCli({ "-c", "PythonShell", OpenCOR::fileName("src/plugins/support/PythonSupport/tests/data/basictests.py") }, output));
-    QCOMPARE(output, OpenCOR::fileContents(OpenCOR::fileName(QString("src/plugins/support/PythonSupport/tests/data/%1/basictests.out").arg(OpenCOR::targetPlatformDir()))));
+    QCOMPARE(output, OpenCOR::fileContents(OpenCOR::fileName("src/plugins/support/PythonSupport/tests/data/basictests.out")));
 }
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(BasicTests)
+QTEST_APPLESS_MAIN(BasicTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/PythonSupport/tests/coveragetests.cpp b/src/plugins/support/PythonSupport/tests/coveragetests.cpp
@@ -41,12 +41,12 @@ void CoverageTests::tests()
     QStringList output;
 
     QVERIFY(!OpenCOR::runCli({ "-c", "PythonShell", OpenCOR::fileName("src/plugins/support/PythonSupport/tests/data/coveragetests.py") }, output));
-    QCOMPARE(output, OpenCOR::fileContents(OpenCOR::fileName(QString("src/plugins/support/PythonSupport/tests/data/%1/coveragetests.out").arg(OpenCOR::targetPlatformDir()))));
+    QCOMPARE(output, OpenCOR::fileContents(OpenCOR::fileName("src/plugins/support/PythonSupport/tests/data/coveragetests.out")));
 }
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(CoverageTests)
+QTEST_APPLESS_MAIN(CoverageTests)
 
 //==============================================================================
 // End of file

diff --git a/...ort/tests/data/linux/debug/basictests.out → ...t/PythonSupport/tests/data/basictests.out b/...ort/tests/data/linux/debug/basictests.out → ...t/PythonSupport/tests/data/basictests.out