From bfd0be0c1ef7c7265be11bd8c43db782237b935f Mon Sep 17 00:00:00 2001
From: Hyeongseok Oh <hseok82.oh@samsung.com>
Date: Fri, 7 Apr 2017 01:23:13 +0900
Subject: [PATCH] [x86/Linux] PAL test in CI build (dotnet/coreclr#10688)

* [x86/Linux] PAL test in CI build

Add PAL test in CI x86/Linux build
Change docker image: including rootfs

* Fix netci.groovy

Add PAL test's result


Commit migrated from https://github.com/dotnet/coreclr/commit/94c9d782c39b486cb8e4f1a315115ac19450ce2d
---
 src/coreclr/netci.groovy                   |  3 ++-
 src/coreclr/tests/scripts/x86_ci_script.sh | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy
index 15092ed..2c269e7 100755
--- a/src/coreclr/netci.groovy
+++ b/src/coreclr/netci.groovy
@@ -1534,8 +1534,9 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                 case 'x64':
                 case 'x86':
                     if (architecture == 'x86' && os == 'Ubuntu') {
-                        // build only, not test yet
+                        // build and PAL test
                         buildCommands += "./tests/scripts/x86_ci_script.sh --buildConfig=${lowerConfiguration}"
+                        Utilities.addXUnitDotNETResults(newJob, '**/pal_tests.xml')
                         break;
                     }
 
diff --git a/src/coreclr/tests/scripts/x86_ci_script.sh b/src/coreclr/tests/scripts/x86_ci_script.sh
index ad730a3..1f82c30 100755
--- a/src/coreclr/tests/scripts/x86_ci_script.sh
+++ b/src/coreclr/tests/scripts/x86_ci_script.sh
@@ -37,21 +37,22 @@ __buildDirName="$__buildOS.$__buildArch.$__buildConfig"
 set -x
 set -e
 
-__currentWorkingDir=`pwd`
-__dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1604_cross_prereqs_v3"
-__dockerCmd="sudo docker run --privileged -i --rm -v $__currentWorkingDir:/opt/code -w /opt/code $__dockerImage"
-
-# make rootfs for x86
-__buildRootfsCmd="./cross/build-rootfs.sh x86 xenial --skipunmount"
-(set +x; echo "Build RootFS for x86 xenial")
-$__dockerCmd $__buildRootfsCmd
-sudo chown -R $(id -u -n) cross/rootfs/
+__dockerImage="hseok82/dotnet-buildtools-prereqs:ubuntu1604_cross_prereqs_v3_x86"
 
 # Begin cross build
 # We cannot build nuget package yet
-__buildCmd="./build.sh x86 cross skiptests skipnuget $__buildConfig"
+__dockerEnvironmentSet="-e ROOTFS_DIR=/crossrootfs/x86"
+__currentWorkingDir=`pwd`
+__dockerCmd="docker run -i --rm ${__dockerEnvironmentVariable} -v $__currentWorkingDir:/opt/code -w /opt/code $__dockerImage"
+__buildCmd="./build.sh x86 cross skipnuget $__buildConfig"
 $__dockerCmd $__buildCmd
-sudo chown -R $(id -u -n) bin/
 
+# Begin PAL test
+__dockerImage="hseok82/dotnet-buildtools-prereqs:ubuntu1604_x86_test"
+__dockerCmd="docker run -i --rm -v $__currentWorkingDir:/opt/code -w /opt/code $__dockerImage"
+__palTestCmd="./src/pal/tests/palsuite/runpaltests.sh /opt/code/bin/obj/Linux.x86.${__buildConfig} /opt/code/bin/paltestout"
+$__dockerCmd $__palTestCmd
+
+sudo chown -R $(id -u -n) bin/
 
 (set +x; echo 'Build complete')
-- 
2.7.4