fix failing tests in ucrt64 (#1287)

* add missing resources
OpenModelica · Mar 20, 2024 · 2f38a49 · 2f38a49
1 parent 735a85a
commit 2f38a49
Show file tree

Hide file tree

Showing 21 changed files with 86 additions and 47 deletions.
diff --git a/testsuite/resources/fmi_attributes_19/binaries/win64/fmi_attributes_19.dll b/testsuite/resources/fmi_attributes_19/binaries/win64/fmi_attributes_19.dll
diff --git a/testsuite/resources/fmi_attributes_19/binaries/win64/fmi_attributes_19.lib b/testsuite/resources/fmi_attributes_19/binaries/win64/fmi_attributes_19.lib
diff --git a/testsuite/resources/fmi_attributes_19/modelDescription.xml b/testsuite/resources/fmi_attributes_19/modelDescription.xml
@@ -2,10 +2,10 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="fmi_attributes_19"
-  guid="{390234b1-e001-4b5c-aebe-7c3337586558}"
+  guid="{847f054a-1770-4829-b9c8-e4d7c73df3c0}"
   description=""
-  generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-59-g0e39c77344 (64-bit)"
-  generationDateAndTime="2022-05-20T09:13:14Z"
+  generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
+  generationDateAndTime="2024-03-20T16:02:42Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <CoSimulation
@@ -18,7 +18,7 @@
     canBeInstantiatedOnlyOncePerProcess="false"
     canNotUseMemoryManagementFunctions="false"
     canGetAndSetFMUstate="true"
-    canSerializeFMUstate="false"
+    canSerializeFMUstate="true"
     providesDirectionalDerivative="true">
     <SourceFiles>
       <File name="fmi_attributes_19.c" />
@@ -44,16 +44,16 @@
       <File name="fmi_attributes_19_18spd.c" />
       <File name="fmi_attributes_19_init_fmu.c" />
       <File name="fmi_attributes_19_FMU.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -86,10 +87,44 @@
       <File name="./simulation/solver/synchronous.c" />
       <File name="./simulation/solver/initialization/initialization.c" />
       <File name="./meta/meta_modelica_catch.c" />
-      <File name="./simulation/solver/nonlinearSolverHomotopy.c" />
-      <File name="./simulation/solver/nonlinearSolverHybrd.c" />
-      <File name="./simulation/solver/nonlinearValuesList.c" />
-      <File name="./simulation/solver/nonlinearSystem.c" />
+      <File name="simulation/solver/nonlinearSolverHomotopy.c" />
+      <File name="simulation/solver/nonlinearSolverHybrd.c" />
+      <File name="simulation/solver/nonlinearValuesList.c" />
+      <File name="simulation/solver/nonlinearSystem.c" />
+      <File name="./external_solvers/dgemm.c" />
+      <File name="./external_solvers/dger.c" />
+      <File name="./external_solvers/dscal.c" />
+      <File name="./external_solvers/dswap.c" />
+      <File name="./external_solvers/dtrsm.c" />
+      <File name="./external_solvers/idamax.c" />
+      <File name="./external_solvers/lsame.c" />
+      <File name="./external_solvers/dgesc2.c" />
+      <File name="./external_solvers/dgesv.c" />
+      <File name="./external_solvers/dgetc2.c" />
+      <File name="./external_solvers/dgetf2.c" />
+      <File name="./external_solvers/dgetrf.c" />
+      <File name="./external_solvers/dgetrs.c" />
+      <File name="./external_solvers/dlabad.c" />
+      <File name="./external_solvers/dlamch.c" />
+      <File name="./external_solvers/dlaswp.c" />
+      <File name="./external_solvers/ieeeck.c" />
+      <File name="./external_solvers/ilaenv.c" />
+      <File name="./external_solvers/iparmq.c" />
+      <File name="./external_solvers/xerbla.c" />
+      <File name="./external_solvers/i_nint.c" />
+      <File name="./external_solvers/pow_di.c" />
+      <File name="./external_solvers/s_cmp.c" />
+      <File name="./external_solvers/s_copy.c" />
+      <File name="./external_solvers/cminpack.h" />
+      <File name="./external_solvers/minpack.h" />
+      <File name="./external_solvers/enorm_.c" />
+      <File name="./external_solvers/hybrj_.c" />
+      <File name="./external_solvers/dpmpar_.c" />
+      <File name="./external_solvers/qrfac_.c" />
+      <File name="./external_solvers/qform_.c" />
+      <File name="./external_solvers/dogleg_.c" />
+      <File name="./external_solvers/r1updt_.c" />
+      <File name="./external_solvers/r1mpyq_.c" />
     </SourceFiles>
   </CoSimulation>
   <LogCategories>
@@ -105,7 +140,7 @@
     <Category name="logAll" description="logAll" />
     <Category name="logFmi2Call" description="logFmi2Call" />
   </LogCategories>
-  <DefaultExperiment startTime="0.0" stopTime="1.0" tolerance="1e-06"/>
+  <DefaultExperiment startTime="0.0" stopTime="1.0" tolerance="1e-6" stepSize="0.002"/>
   <ModelVariables>
   <!-- Index of variable = "1" -->
   <ScalarVariable

diff --git a/testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacA.bin b/testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacA.bin
diff --git a/testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacFMIDER.bin b/testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacFMIDER.bin
diff --git a/testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacFMIDERINIT.bin b/testsuite/resources/fmi_attributes_19/resources/fmi_attributes_19_JacFMIDERINIT.bin
diff --git a/testsuite/resources/tank1/binaries/win64/tank1.dll b/testsuite/resources/tank1/binaries/win64/tank1.dll
diff --git a/testsuite/resources/tank1/binaries/win64/tank1.lib b/testsuite/resources/tank1/binaries/win64/tank1.lib
diff --git a/testsuite/resources/tank1/modelDescription.xml b/testsuite/resources/tank1/modelDescription.xml
@@ -2,10 +2,10 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="tank1"
-  guid="{8911973a-0fe9-45cd-9562-7ba0a6b100f2}"
+  guid="{7714c3e2-0356-4160-977d-611c7c4249ab}"
   description=""
-  generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-101-g55feca18f5 (64-bit)"
-  generationDateAndTime="2022-05-27T12:57:07Z"
+  generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
+  generationDateAndTime="2024-03-20T15:41:37Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <CoSimulation
@@ -18,7 +18,7 @@
     canBeInstantiatedOnlyOncePerProcess="false"
     canNotUseMemoryManagementFunctions="false"
     canGetAndSetFMUstate="true"
-    canSerializeFMUstate="false"
+    canSerializeFMUstate="true"
     providesDirectionalDerivative="true">
     <SourceFiles>
       <File name="tank1.c" />
@@ -44,16 +44,16 @@
       <File name="tank1_18spd.c" />
       <File name="tank1_init_fmu.c" />
       <File name="tank1_FMU.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -101,7 +102,7 @@
     <Category name="logAll" description="logAll" />
     <Category name="logFmi2Call" description="logFmi2Call" />
   </LogCategories>
-  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-06"/>
+  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-6" stepSize="0.2"/>
   <ModelVariables>
   <!-- Index of variable = "1" -->
   <ScalarVariable

diff --git a/testsuite/resources/tank2/binaries/win64/tank2.dll b/testsuite/resources/tank2/binaries/win64/tank2.dll
diff --git a/testsuite/resources/tank2/binaries/win64/tank2.lib b/testsuite/resources/tank2/binaries/win64/tank2.lib
diff --git a/testsuite/resources/tank2/modelDescription.xml b/testsuite/resources/tank2/modelDescription.xml
@@ -2,10 +2,10 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="tank2"
-  guid="{4154dc58-df31-415f-8b9e-d283e476e7fd}"
+  guid="{8d4a506f-fcdd-4950-a825-50ed5f8623c3}"
   description=""
-  generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-101-g55feca18f5 (64-bit)"
-  generationDateAndTime="2022-05-27T12:57:12Z"
+  generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
+  generationDateAndTime="2024-03-20T15:41:57Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <CoSimulation
@@ -18,7 +18,7 @@
     canBeInstantiatedOnlyOncePerProcess="false"
     canNotUseMemoryManagementFunctions="false"
     canGetAndSetFMUstate="true"
-    canSerializeFMUstate="false"
+    canSerializeFMUstate="true"
     providesDirectionalDerivative="true">
     <SourceFiles>
       <File name="tank2.c" />
@@ -44,16 +44,16 @@
       <File name="tank2_18spd.c" />
       <File name="tank2_init_fmu.c" />
       <File name="tank2_FMU.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -101,7 +102,7 @@
     <Category name="logAll" description="logAll" />
     <Category name="logFmi2Call" description="logFmi2Call" />
   </LogCategories>
-  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-06"/>
+  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-6" stepSize="0.2"/>
   <ModelVariables>
   <!-- Index of variable = "1" -->
   <ScalarVariable

diff --git a/testsuite/resources/tank3/binaries/win64/tank3.dll b/testsuite/resources/tank3/binaries/win64/tank3.dll
diff --git a/testsuite/resources/tank3/binaries/win64/tank3.lib b/testsuite/resources/tank3/binaries/win64/tank3.lib
diff --git a/testsuite/resources/tank3/modelDescription.xml b/testsuite/resources/tank3/modelDescription.xml
@@ -2,10 +2,10 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="tank3"
-  guid="{d0df5a3c-8fa5-44ac-a7a9-583216eea9be}"
+  guid="{23d183a6-2f89-4259-9f09-e3cefa395b72}"
   description=""
-  generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-101-g55feca18f5 (64-bit)"
-  generationDateAndTime="2022-05-27T12:57:16Z"
+  generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
+  generationDateAndTime="2024-03-20T15:42:18Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <CoSimulation
@@ -18,7 +18,7 @@
     canBeInstantiatedOnlyOncePerProcess="false"
     canNotUseMemoryManagementFunctions="false"
     canGetAndSetFMUstate="true"
-    canSerializeFMUstate="false"
+    canSerializeFMUstate="true"
     providesDirectionalDerivative="true">
     <SourceFiles>
       <File name="tank3.c" />
@@ -44,16 +44,16 @@
       <File name="tank3_18spd.c" />
       <File name="tank3_init_fmu.c" />
       <File name="tank3_FMU.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -101,7 +102,7 @@
     <Category name="logAll" description="logAll" />
     <Category name="logFmi2Call" description="logFmi2Call" />
   </LogCategories>
-  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-06"/>
+  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-6" stepSize="0.2"/>
   <ModelVariables>
   <!-- Index of variable = "1" -->
   <ScalarVariable

diff --git a/testsuite/resources/ypipe/binaries/win64/ypipe.dll b/testsuite/resources/ypipe/binaries/win64/ypipe.dll
diff --git a/testsuite/resources/ypipe/binaries/win64/ypipe.lib b/testsuite/resources/ypipe/binaries/win64/ypipe.lib
diff --git a/testsuite/resources/ypipe/modelDescription.xml b/testsuite/resources/ypipe/modelDescription.xml
@@ -2,10 +2,10 @@
 <fmiModelDescription
   fmiVersion="2.0"
   modelName="ypipe"
-  guid="{f3cbb71a-bbb8-490d-8b25-3bb0d58a7746}"
+  guid="{b1f5f57d-07a4-4cbd-a302-981908370360}"
   description=""
-  generationTool="OpenModelica Compiler OpenModelica v1.20.0-dev-101-g55feca18f5 (64-bit)"
-  generationDateAndTime="2022-05-27T12:57:21Z"
+  generationTool="OpenModelica Compiler v1.23.0-dev-385-gb786a4f951-cmake"
+  generationDateAndTime="2024-03-20T15:42:40Z"
   variableNamingConvention="structured"
   numberOfEventIndicators="0">
   <CoSimulation
@@ -18,7 +18,7 @@
     canBeInstantiatedOnlyOncePerProcess="false"
     canNotUseMemoryManagementFunctions="false"
     canGetAndSetFMUstate="true"
-    canSerializeFMUstate="false"
+    canSerializeFMUstate="true"
     providesDirectionalDerivative="true">
     <SourceFiles>
       <File name="ypipe.c" />
@@ -44,16 +44,16 @@
       <File name="ypipe_18spd.c" />
       <File name="ypipe_init_fmu.c" />
       <File name="ypipe_FMU.c" />
-      <File name="gc/memory_pool.c" />
-      <File name="gc/omc_gc.c" />
+      <File name="./gc/memory_pool.c" />
+      <File name="./gc/omc_gc.c" />
       <File name="./util/base_array.c" />
       <File name="./util/boolean_array.c" />
+      <File name="./util/context.c" />
       <File name="./util/division.c" />
       <File name="./util/doubleEndedList.c" />
       <File name="./util/generic_array.c" />
       <File name="./util/index_spec.c" />
       <File name="./util/integer_array.c" />
-      <File name="./util/jacobian_util.c" />
       <File name="./util/list.c" />
       <File name="./util/modelica_string_lit.c" />
       <File name="./util/modelica_string.c" />
@@ -73,6 +73,7 @@
       <File name="./util/utility.c" />
       <File name="./util/varinfo.c" />
       <File name="./math-support/pivot.c" />
+      <File name="./simulation/jacobian_util.c" />
       <File name="./simulation/omc_simulation_util.c" />
       <File name="./simulation/options.c" />
       <File name="./simulation/simulation_info_json.c" />
@@ -101,7 +102,7 @@
     <Category name="logAll" description="logAll" />
     <Category name="logFmi2Call" description="logFmi2Call" />
   </LogCategories>
-  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-06"/>
+  <DefaultExperiment startTime="0.0" stopTime="100.0" tolerance="1e-6" stepSize="0.2"/>
   <ModelVariables>
   <!-- Index of variable = "1" -->
   <ScalarVariable

diff --git a/testsuite/simulation/fmuState01.lua b/testsuite/simulation/fmuState01.lua
@@ -2,7 +2,7 @@
 -- teardown_command: rm -rf fmuState_lua/
 -- linux: no
 -- mac: no
--- ucrt64: no
+-- ucrt64: yes
 -- win: no
 
 oms_setCommandLineOption("--suppressPath=true")

diff --git a/testsuite/simulation/multipleInstance.lua b/testsuite/simulation/multipleInstance.lua
@@ -1,7 +1,7 @@
 -- status: correct
 -- teardown_command: rm -rf multiple_instance_lua/
 -- linux: no
--- ucrt64: no
+-- ucrt64: yes
 -- win: no
 -- mac: no
 

diff --git a/testsuite/simulation/tankYPipe.lua b/testsuite/simulation/tankYPipe.lua
@@ -1,7 +1,7 @@
 -- status: correct
 -- teardown_command: rm -rf tankypipe_lua/
 -- linux: no
--- ucrt64: no
+-- ucrt64: yes
 -- win: no
 -- mac: no