Update OMSimulator (#7333)

OpenModelica · Mar 29, 2021 · c2d2d8d · c2d2d8d
1 parent ebfaa08
commit c2d2d8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/OMSimulator b/OMSimulator
diff --git a/testsuite/omsimulator/Makefile b/testsuite/omsimulator/Makefile
@@ -15,13 +15,13 @@ outputState.mos \
 reset_omc.mos \
 reset.mos \
 resetWithLoops.mos \
-test03.mos \
 testDirectionalDerivatives.mos \
 testLoopsOverFMUs.mos \
 testSynchronousFMU_01.mos \
 testSynchronousFMU_02.mos
 
 FAILINGTESTFILES = \
+test03.mos \
 
 # Dependency files that are not .mo .mos or Makefile
 # Add them here or they will be cleaned.

diff --git a/testsuite/omsimulator/test03.mos b/testsuite/omsimulator/test03.mos
@@ -137,12 +137,13 @@ unloadOMSimulator();
 // 		<ssd:Annotations>
 // 			<ssc:Annotation type="org.openmodelica">
 // 				<oms:Annotations>
-// 					<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter=".*" />
+// 					<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter="resources/signalFilter.xml" />
 // 				</oms:Annotations>
 // 			</ssc:Annotation>
 // 		</ssd:Annotations>
 // 	</ssd:DefaultExperiment>
 // </ssd:SystemStructureDescription>
+// error:   [getResourceNode] Failed to find node "resources/signalFilter.xml"
 // status:  [correct] ok
 // <?xml version="1.0"?>
 // <ssd:SystemStructureDescription xmlns:ssc="http://ssp-standard.org/SSP1/SystemStructureCommon" xmlns:ssd="http://ssp-standard.org/SSP1/SystemStructureDescription" xmlns:ssv="http://ssp-standard.org/SSP1/SystemStructureParameterValues" xmlns:ssm="http://ssp-standard.org/SSP1/SystemStructureParameterMapping" xmlns:ssb="http://ssp-standard.org/SSP1/SystemStructureSignalDictionary" xmlns:oms="https://raw.githubusercontent.com/OpenModelica/OMSimulator/master/schema/oms.xsd" name="test" version="1.0">
@@ -186,11 +187,13 @@ unloadOMSimulator();
 // 		<ssd:Annotations>
 // 			<ssc:Annotation type="org.openmodelica">
 // 				<oms:Annotations>
-// 					<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter=".*" />
+// 					<oms:SimulationInformation resultFile="test_res.mat" loggingInterval="0.000000" bufferSize="10" signalFilter="resources/signalFilter.xml" />
 // 				</oms:Annotations>
 // 			</ssc:Annotation>
 // 		</ssd:Annotations>
 // 	</ssd:DefaultExperiment>
 // </ssd:SystemStructureDescription>
 // info:    Result file: test_res.mat (bufferSize=10)
+// info:    0 warnings
+// info:    1 errors
 // endResult