Skip to content

Commit

Permalink
Fix reconfigure in the Qt/testsuite jobs (#7099)
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed Jan 22, 2021
1 parent 60f3fc1 commit e35fddc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .CI/common.groovy
Expand Up @@ -331,7 +331,7 @@ void buildGUI(stash, isQt5) {
if (stash) {
patchConfigStatus()
}
sh 'CONFIG=`./config.status --config` && ./configure `eval $CONFIG`'
sh 'echo ./configure `./config.status --config` > config.status.2 && bash ./config.status.2'
// compile OMSens_Qt for Qt5
if (isQt5) {
sh "touch omc.skip omc-diff.skip ReferenceFiles.skip omsimulator.skip && ${makeCommand()} -q omc omc-diff ReferenceFiles omsimulator" // Pretend we already built omc since we already did so
Expand Down Expand Up @@ -374,7 +374,7 @@ void buildAndRunOMEditTestsuite(stash) {
if (stash) {
patchConfigStatus()
}
sh 'CONFIG=`./config.status --config` && ./configure `eval $CONFIG`'
sh 'echo ./configure `./config.status --config` > config.status.2 && bash ./config.status.2'
sh "touch omc.skip omc-diff.skip ReferenceFiles.skip omsimulator.skip omedit.skip omplot.skip omparser.skip && ${makeCommand()} -q omc omc-diff ReferenceFiles omsimulator omedit omplot omparser" // Pretend we already built omc since we already did so
sh "${makeCommand()} -j${numPhysicalCPU()} --output-sync=recurse omedit-testsuite" // Builds the OMEdit testsuite
sh label: 'RunOMEditTestsuite', script: '''
Expand Down

0 comments on commit e35fddc

Please sign in to comment.