Catch exceptions in generateHTML.py (#1065)

OpenModelica · Jul 15, 2021 · 9172d3b · 9172d3b
1 parent 8a33da1
commit 9172d3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/testsuite/fmi-cross-check/generateHTML.py b/testsuite/fmi-cross-check/generateHTML.py
@@ -146,15 +146,15 @@ def constructDF(crossCheckDir, platform, omsVersion):
     for fmiType in ["me", "cs"]:
       toolsDir = os.path.join(crossCheckDir, "fmus", fmiVersion, fmiType, platform)
       for exportingToolID in os.listdir(toolsDir):
-        versionsDir = os.path.join(toolsDir, exportingToolID) 
+        versionsDir = os.path.join(toolsDir, exportingToolID)
         for exportingToolVersion in os.listdir(versionsDir):
           fmusDir = os.path.join(versionsDir, exportingToolVersion)
           for modelName in os.listdir(fmusDir):
             # Skipt not compliant FMUs
             if ignoreNotCompliantWithLatestRules:
               if os.path.isfile(os.path.join(crossCheckDir, "fmus", fmiVersion, fmiType, platform, exportingToolID, exportingToolVersion, modelName, "notCompliantWithLatestRules")):
                 continue
-            
+
             testFMUDir = os.path.join(crossCheckDir, "fmus", fmiVersion, fmiType, platform,         \
                                       exportingToolID, exportingToolVersion, modelName)
             resultDir = os.path.join(crossCheckDir, "results", fmiVersion, fmiType,                 \
@@ -164,8 +164,15 @@ def constructDF(crossCheckDir, platform, omsVersion):
             # Check for result file
             canSimulate = os.path.isfile(os.path.join(resultDir, modelName + "_out.csv"))
 
-            output = open(os.path.join(resultDir, "OMSimulator_out.log"), "r").read()
-            error = open(os.path.join(resultDir, "OMSimulator_err.log"), "r").read()
+            try:
+              output = open(os.path.join(resultDir, "OMSimulator_out.log"), "r").read()
+            except:
+              output = ""
+
+            try:
+              error = open(os.path.join(resultDir, "OMSimulator_err.log"), "r").read()
+            except:
+              error = ""
 
             resultsCorrect = os.path.isfile(os.path.join(resultDir, "passed"))
 

diff --git a/testsuite/fmi-cross-check/run_tests.py b/testsuite/fmi-cross-check/run_tests.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+#./../OpenModelica/OMSimulator/testsuite/fmi-cross-check/run_tests.py --root=. --platform=linux64 --oms=.omsimulator/OMSimulator-linux-amd64-v2.1.1/bin/OMSimulator --version=v2.1.1
+#find ./results/2.0/*/linux64/OMSimulator/v2.1.1/ -name "passed" | wc -l
 
 import argparse
 import os