Skip to content

Commit

Permalink
Fix FMI Cross Check with Wine (#922)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
AnHeuermann authored Jan 28, 2021
1 parent e1a9d7f commit da3dd62
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
19 changes: 19 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,25 @@ EXIT /b 1
}
}

stage('cross-compilation') {
agent {
docker {
image 'anheuermann/ompython:wine-bionic'
label 'linux'
alwaysPull true
}
}
environment {
HOME = "${env.WORKSPACE}"
}
steps {
unstash name: 'mingw64-install'
sh """
wine64 install/mingw/bin/OMSimulator.exe --version
"""
}
}

stage('upload') {
parallel {

Expand Down
2 changes: 1 addition & 1 deletion OMTLMSimulator
Submodule OMTLMSimulator updated 1 files
+1 −1 Makefile.head
5 changes: 4 additions & 1 deletion testsuite/fmi-cross-check/generateHTML.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ def generateOverviewHTML(crossCheckDir, platform, omsVersion, omsVersionShort, t
commitshort = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=crossCheckDir).decode('utf-8')
commitfull = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=crossCheckDir).decode('utf-8')

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

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

Expand Down

0 comments on commit da3dd62

Please sign in to comment.