summaryrefslogtreecommitdiff
path: root/netci.groovy
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-04-27 07:54:50 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-04-27 07:54:50 (GMT)
commit5b975f8233e8c8d17b215372f89ca713b45d6a0b (patch)
tree0267bcc331458a01f4c26fafd28110a72273beb3 /netci.groovy
parenta56e30c8d33048216567753d9d3fefc2152af8ac (diff)
downloadcoreclr-5b975f8233e8c8d17b215372f89ca713b45d6a0b.zip
coreclr-5b975f8233e8c8d17b215372f89ca713b45d6a0b.tar.gz
coreclr-5b975f8233e8c8d17b215372f89ca713b45d6a0b.tar.bz2
Imported Upstream version 2.0.0.11599upstream/2.0.0.11599
Diffstat (limited to 'netci.groovy')
-rwxr-xr-xnetci.groovy7
1 files changed, 6 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy
index 05e5d7f..9e0339a 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 = ''