diff options
Diffstat (limited to 'netci.groovy')
-rwxr-xr-x | netci.groovy | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy index 05e5d7fa7d..9e0339a366 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1640,6 +1640,11 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR if (os != 'Tizen') { buildCommands += "chmod a+x ./bin/CoreFxBinDir/corerun" } + // Test environment emulation using docker and qemu has some problem to use lttng library. + // We should remove libcoreclrtraceptprovider.so to avoid test hang. + if (os == 'Ubuntu') { + buildCommands += "rm -f -v ./bin/CoreFxBinDir/libcoreclrtraceptprovider.so" + } // Call the ARM CI script to cross build and test using docker buildCommands += """./tests/scripts/arm32_ci_script.sh \\ @@ -2160,7 +2165,7 @@ combinedScenarios.each { scenario -> if (testBuildScenario == 'coverage' || testBuildScenario == 'pri1r2r'|| testBuildScenario == 'gcstress15_pri1r2r') { testBuildScenario = 'pri1' } - else if ( testBuildScenario == 'r2r' || isLongGc(testBuildScenario)) { + else if ( testBuildScenario == 'r2r' || Constants.r2rJitStressScenarios.indexOf(testBuildScenario) != -1 || isLongGc(testBuildScenario)) { testBuildScenario = 'default' } def inputWindowTestsBuildName = '' |