Skip to content

Commit e8d92cd

Browse files
authored
return the FMI testing to max cores (#161)
1 parent 187f86e commit e8d92cd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.CI/Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pipeline {
135135
expression { params.fmi_v1_23 }
136136
}
137137
steps {
138-
runRegressiontest('maintenance/v1.23', 'v1.23-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false, 8)
138+
runRegressiontest('maintenance/v1.23', 'v1.23-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
139139
}
140140
}
141141
stage('v1.24 FMI with OMSimulator') {
@@ -151,7 +151,7 @@ pipeline {
151151
expression { params.fmi_v1_24 }
152152
}
153153
steps {
154-
runRegressiontest('maintenance/v1.24', 'v1.24-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false, 8)
154+
runRegressiontest('maintenance/v1.24', 'v1.24-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
155155
}
156156
}
157157
stage('master FMI with OMSimulator') {
@@ -167,7 +167,7 @@ pipeline {
167167
expression { params.fmi_master }
168168
}
169169
steps {
170-
runRegressiontest('master', 'master-fmi', '', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false, 8)
170+
runRegressiontest('master', 'master-fmi', '', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
171171
}
172172
}
173173

@@ -185,7 +185,7 @@ pipeline {
185185
expression { params.fmpy_fmi_v1_23 }
186186
}
187187
steps {
188-
runRegressiontest('maintenance/v1.23', 'v1.23-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false, 8)
188+
runRegressiontest('maintenance/v1.23', 'v1.23-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
189189
}
190190
}
191191
stage('v1.24 FMI with FMPy') {
@@ -201,7 +201,7 @@ pipeline {
201201
expression { params.fmpy_fmi_v1_24 }
202202
}
203203
steps {
204-
runRegressiontest('maintenance/v1.24', 'v1.24-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false, 8)
204+
runRegressiontest('maintenance/v1.24', 'v1.24-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
205205
}
206206
}
207207
stage('master FMI with FMPy') {
@@ -217,7 +217,7 @@ pipeline {
217217
expression { params.fmpy_fmi_master }
218218
}
219219
steps {
220-
runRegressiontest('master', 'master-fmi-fmpy', '', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false, 8)
220+
runRegressiontest('master', 'master-fmi-fmpy', '', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
221221
}
222222
}
223223
stage('newInst-daeMode') {

testmodel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def target(res):
7878
ignore = omc.sendExpression("alarm(%s)" % timeout)
7979
res[0] = omc.sendExpression(cmd)
8080
with open(errFile, 'a+') as fp:
81-
fp.write(omc.sendExpression('OpenModelica.Scripting.getErrorString()'))
81+
fp.write(omc.sendExpression('OpenModelica.Scripting.getErrorString()', parsed = False))
8282
elapsed = omc.sendExpression("alarm(0)")
8383
with open(errFile, 'a+') as fp:
8484
fp.write("[Timeout remaining time %s]\n" % elapsed)

0 commit comments

Comments
 (0)