summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyeongseok Oh <hseok82.oh@samsung.com>2017-04-18 00:56:19 +0900
committerGaurav Khanna <gkhanna@microsoft.com>2017-04-17 08:56:19 -0700
commit591be50e6f74b821a6d2a7776bbae0b33a9e6809 (patch)
tree222eaf85fd31be738ffb8de170d882fda7fde09c
parentdd52e03376af6d02ec1938099bbc796352437798 (diff)
downloadcoreclr-591be50e6f74b821a6d2a7776bbae0b33a9e6809.tar.gz
coreclr-591be50e6f74b821a6d2a7776bbae0b33a9e6809.tar.bz2
coreclr-591be50e6f74b821a6d2a7776bbae0b33a9e6809.zip
Fix ARM32/Linux release CI test failure (#11008)
* Fix ARM32/Linux release CI test failure Fix ARM32/Linux release CI test failure by removing libcoreclrptprovider.so from CoreFX build results. * Fix typo Fix typo in netci.groovy
-rwxr-xr-xnetci.groovy5
-rwxr-xr-xtests/scripts/arm32_ci_test.sh3
2 files changed, 7 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy
index 05e5d7fa7d..247da038c2 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 \\
diff --git a/tests/scripts/arm32_ci_test.sh b/tests/scripts/arm32_ci_test.sh
index 995bbf85b0..2f0b03150b 100755
--- a/tests/scripts/arm32_ci_test.sh
+++ b/tests/scripts/arm32_ci_test.sh
@@ -114,7 +114,8 @@ mount -o bind ${CORECLR_DIR} ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}
# Test environment emulation using docker and qemu has some problem to use lttng library.
# We should remove libcoreclrtraceptprovider.so to avoid test hang.
-rm -f ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName}/libcoreclrtraceptprovider.so
+rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName}/libcoreclrtraceptprovider.so
+rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/CoreFxBinDir/libcoreclrtraceptprovider.so
chroot ${__ROOTFS_DIR} /bin/bash -x <<EOF
cd ${ARM_CHROOT_HOME_DIR}