Merge b476b7f into 7035b61

opencor · Aug 10, 2020 · c9e93bb · c9e93bb
2 parents 7035b61 + b476b7f
commit c9e93bb
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 22 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
@@ -45,7 +45,7 @@ void BasicTests::tests()
 
 //==============================================================================
 
-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
@@ -46,7 +46,7 @@ void CoverageTests::tests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(CoverageTests)
+QTEST_APPLESS_MAIN(CoverageTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/PythonSupport/tests/hodgkinhuxley1952tests.cpp b/src/plugins/support/PythonSupport/tests/hodgkinhuxley1952tests.cpp
@@ -45,7 +45,7 @@ void HodgkinHuxley1952Tests::tests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(HodgkinHuxley1952Tests)
+QTEST_APPLESS_MAIN(HodgkinHuxley1952Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/PythonSupport/tests/importtests.cpp b/src/plugins/support/PythonSupport/tests/importtests.cpp
@@ -50,7 +50,7 @@ void ImportTests::tests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(ImportTests)
+QTEST_APPLESS_MAIN(ImportTests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/PythonSupport/tests/noble1962tests.cpp b/src/plugins/support/PythonSupport/tests/noble1962tests.cpp
@@ -45,7 +45,7 @@ void Noble1962Tests::tests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Noble1962Tests)
+QTEST_APPLESS_MAIN(Noble1962Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/PythonSupport/tests/vanderpol1928tests.cpp b/src/plugins/support/PythonSupport/tests/vanderpol1928tests.cpp
@@ -45,7 +45,7 @@ void VanDerPol1928Tests::tests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(VanDerPol1928Tests)
+QTEST_APPLESS_MAIN(VanDerPol1928Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/SEDMLSupport/tests/tests.cpp b/src/plugins/support/SEDMLSupport/tests/tests.cpp
@@ -262,7 +262,7 @@ void Tests::symbolStyleTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/support/ZIPSupport/tests/tests.cpp b/src/plugins/support/ZIPSupport/tests/tests.cpp
@@ -107,7 +107,7 @@ void Tests::uncompressTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/thirdParty/CellMLAPI/tests/tests.cpp b/src/plugins/thirdParty/CellMLAPI/tests/tests.cpp
@@ -99,7 +99,7 @@ void Tests::basicTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/thirdParty/Zinc/tests/tests.cpp b/src/plugins/thirdParty/Zinc/tests/tests.cpp
@@ -69,7 +69,7 @@ void Tests::basicTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/thirdParty/libBioSignalML/tests/tests.cpp b/src/plugins/thirdParty/libBioSignalML/tests/tests.cpp
@@ -48,7 +48,7 @@ void Tests::basicTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/thirdParty/libNuML/tests/tests.cpp b/src/plugins/thirdParty/libNuML/tests/tests.cpp
@@ -58,7 +58,7 @@ void Tests::basicTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/thirdParty/libSBML/tests/tests.cpp b/src/plugins/thirdParty/libSBML/tests/tests.cpp
@@ -69,7 +69,7 @@ void Tests::basicTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/thirdParty/libSEDML/tests/tests.cpp b/src/plugins/thirdParty/libSEDML/tests/tests.cpp
@@ -61,7 +61,7 @@ void Tests::basicTests()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file

diff --git a/src/plugins/tools/CellMLTools/tests/tests.cpp b/src/plugins/tools/CellMLTools/tests/tests.cpp
@@ -151,7 +151,7 @@ void Tests::validateCellmlFiles()
 
 //==============================================================================
 
-QTEST_GUILESS_MAIN(Tests)
+QTEST_APPLESS_MAIN(Tests)
 
 //==============================================================================
 // End of file