Support noarch packages and update run.sh script

Change-Id: I64ad32ccf5fd3652cfa28cff0e9decf04e2ac628

diff --git a/install.sh b/install.sh
index 01579db..acd6386 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -117,19 +117,20 @@ if [[ $clrdir == "" ]]; then
 fi
 tcdir="$clrdir/Windows_NT.${tcarch}.Release"
 
-if [ $skiptcdirremove == 0 ]; then
+if [[ $skiptcdirremove == 0 ]]; then
     sdb ${opt} shell rm -rf $clrdir
 fi
 sdb ${opt} shell mkdir -p ${clrdir}
 
-if [ $skiprpminstall == 0 ]; then
+if [[ $skiprpminstall == 0 ]]; then
     echo "Target arch : ${target}"
     echo "Check valid repository url"
     if [[ $url == "" ]]; then
         repo_url="http://165.213.149.200/download/public_mirror/tizen/unified"
         url=$repo_url"/"$version"/repos/"$target_type"/packages/"
+    elif [[ ! $url == *"noarch"* ]]; then
+        url=$url"/"$target"/"
     fi
-    url=$url"/"$target"/"
     check_valid_url $url
 
     echo -e " \n\n---- Donwload coreclr-test-*.rpm ----"
@@ -139,6 +140,7 @@ if [ $skiprpminstall == 0 ]; then
     tmpdir="$clrdir/tmp"
     sdb ${opt} shell mkdir -p $tmpdir
     sdb ${opt} push rpms/*.${target}.rpm $tmpdir
+    sdb ${opt} push rpms/*.noarch.rpm $tmpdir
     sdb ${opt} shell rpm -ivh --force $tmpdir/*.rpm
     sdb ${opt} shell rm -rf $tmpdir
     rm -rf rpms/coreclr-test-*.rpm

diff --git a/run.sh b/run.sh
index 93baaf1..c4a7139 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -4,10 +4,15 @@ usage()
 {
     echo "Usage: $0 --device=[name]"
     echo "--device - You can get the name by using 'sdb devices' command"
+    echo "--prefix-dir  - You can specify the prefix directory for performing the unittest"
+    echo "                like /opt/usr/coreclr-tc"
+    echo "                Default is '/opt/usr/coreclr-tc'."
     exit 1
 }
 
 opt="-d"
+clrdir=""
+
 for i in "$@"
 do
     if [ $# -le 0 ]; then
@@ -20,8 +25,12 @@ do
         exit 1
         ;;
     --device=*)
-        opt="-s ${i#*}"
+        opt="-s "${i#*=}
+        ;;
+    --prefix-dir=*)
+        clrdir=${i#*=}
         ;;
+
     *)
         usage
         exit 1
@@ -30,9 +39,6 @@ do
     shift
 done
 
-clrdir="/opt/usr/coreclr-tc"
-overlaydir="$clrdir/overlay"
-
 sdb ${opt} root on
 
 if [ $? != 0 ]; then
@@ -49,9 +55,14 @@ else
     exit 1
 fi
 
+if [[ $clrdir == "" ]]; then
+       clrdir="/opt/usr/coreclr-tc"
+fi
+tcdir="$clrdir/Windows_NT.${tcarch}.Release"
+overlaydir="$tcdir/Tests/coreoverlay"
+
 sdb ${opt} shell "cd $clrdir && \
-        ./runtest.sh \
-        --testRootDir=$clrdir/Windows_NT.${tcarch}.Release \
+        ./runtest.sh --testRootDir=$tcdir \
         --testNativeBinDir=/usr/share/dotnet.tizen/test \
-        --coreOverlayDir=$overlaydir | tee clr.log"
+        --coreOverlayDir=$overlaydir --show-time --no-lf-conversion | tee clr.log"