From: Hyeongseok Oh <hseok82.oh@samsung.com>
Date: Mon, 17 Apr 2017 15:56:19 +0000 (+0900)
Subject: Fix ARM32/Linux release CI test failure (dotnet/coreclr#11008)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7244
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46488d9ed58d3c85c63a3442700beb446385d6fe;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix ARM32/Linux release CI test failure (dotnet/coreclr#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


Commit migrated from https://github.com/dotnet/coreclr/commit/591be50e6f74b821a6d2a7776bbae0b33a9e6809
---

diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy
index 05e5d7f..247da03 100755
--- a/src/coreclr/netci.groovy
+++ b/src/coreclr/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/src/coreclr/tests/scripts/arm32_ci_test.sh b/src/coreclr/tests/scripts/arm32_ci_test.sh
index 995bbf8..2f0b031 100755
--- a/src/coreclr/tests/scripts/arm32_ci_test.sh
+++ b/src/coreclr/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}