Skip to content

Commit da3dd62

Browse files
authored
Fix FMI Cross Check with Wine (#922)
* Fix HTML generation fro fmi-cross-check with stable version * Update OMTLMSimulator and test wine execution - link with -static-libstdc++ on MINGW - Add check to Jenkins to see if wine can execute MINGW OMSimulator binary
1 parent e1a9d7f commit da3dd62

3 files changed

Lines changed: 24 additions & 2 deletions

File tree

Jenkinsfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,25 @@ EXIT /b 1
574574
}
575575
}
576576

577+
stage('cross-compilation') {
578+
agent {
579+
docker {
580+
image 'anheuermann/ompython:wine-bionic'
581+
label 'linux'
582+
alwaysPull true
583+
}
584+
}
585+
environment {
586+
HOME = "${env.WORKSPACE}"
587+
}
588+
steps {
589+
unstash name: 'mingw64-install'
590+
sh """
591+
wine64 install/mingw/bin/OMSimulator.exe --version
592+
"""
593+
}
594+
}
595+
577596
stage('upload') {
578597
parallel {
579598

OMTLMSimulator

testsuite/fmi-cross-check/generateHTML.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ def generateOverviewHTML(crossCheckDir, platform, omsVersion, omsVersionShort, t
9999
commitshort = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=crossCheckDir).decode('utf-8')
100100
commitfull = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=crossCheckDir).decode('utf-8')
101101

102-
omscommitshort = re.search(r"-g.+-",omsVersion).group()[2:9]
102+
if re.search(r"-g.+-",omsVersion):
103+
omscommitshort = re.search(r"-g.+-",omsVersion).group()[2:9]
104+
else:
105+
omscommitshort = "unknown"
103106

104107
htmltpl=open("fmi-cross-check.html.tpl").read()
105108

0 commit comments

Comments
 (0)