Revert "ARM-CI : Fix ARM Emulator vm runs out of space"
authorMatt Mitchell <mmitche@microsoft.com>
Thu, 25 Aug 2016 21:08:59 +0000 (14:08 -0700)
committerGitHub <noreply@github.com>
Thu, 25 Aug 2016 21:08:59 +0000 (14:08 -0700)
tests/scripts/arm32_ci_script.sh

index a8c15e6..2c20d7f 100755 (executable)
@@ -180,10 +180,6 @@ function mount_emulator {
     mount_with_checking "-o bind" "/dev/pts" "$__ARMRootfsMountPath/dev/pts"
     mount_with_checking "-t tmpfs" "shm"     "$__ARMRootfsMountPath/run/shm"
     mount_with_checking "-o bind" "/sys"     "$__ARMRootfsMountPath/sys"
-        if [ ! -d "$__ARMRootfsMountPath/bindings/tmp" ]; then
-        sudo mkdir -p "$__ARMRootfsMountPath/bindings/tmp"
-    fi
-    mount_with_checking "-o bind" "/tmp"     "$__ARMRootfsMountPath/bindings/tmp"
 }
 
 #Cross builds coreclr
@@ -269,7 +265,7 @@ function copy_to_emulator {
 #Runs tests in an emulated mode
 function run_tests {
     sudo chroot $__ARMRootfsMountPath /bin/bash -x <<EOF
-        cd "$__ARMEmulCoreclr"
+        cd /home/coreclr
         ./tests/runtest.sh --testRootDir=$__testRootDirBase \
                            --mscorlibDir=$__mscorlibDirBase \
                            --coreFxNativeBinDir=$__coreFxNativeBinDirBase \
@@ -396,11 +392,10 @@ fi
 __buildDirName="$__buildOS.$__buildArch.$__buildConfig"
 
 #Define emulator paths
-__TempFolder="bindings/tmp"
-__ARMRootfsCoreclrPath="$__ARMRootfsMountPath/$__TempFolder/coreclr"
-__ARMRootfsCorefxPath="$__ARMRootfsMountPath/$__TempFolder/corefx"
-__ARMEmulCoreclr="/$__TempFolder/coreclr"
-__ARMEmulCorefx="/$__TempFolder/corefx"
+__ARMRootfsCoreclrPath="$__ARMRootfsMountPath/home/coreclr"
+__ARMRootfsCorefxPath="$__ARMRootfsMountPath/home/corefx"
+__ARMEmulCoreclr="/home/coreclr"
+__ARMEmulCorefx="/home/corefx"
 __testRootDirBase=
 __mscorlibDirBase=
 __coreFxNativeBinDirBase=