Split run-batch.sh script

Change-Id: I4755c3dc4a07837c78cc242f2df5322013aa4078

diff --git a/src/batch/batch_exec.sh b/src/batch/batch_exec.sh
index 13d93ec0b0927f7089dae989dc3110074ef107ce..c8887ddbef154d6111d382074881c1272ccb2e22 100755 (executable)
--- a/src/batch/batch_exec.sh
+++ b/src/batch/batch_exec.sh
@@ -3,7 +3,7 @@
 
 # Thsose two lines are added to remove calendar app and suppress its crashes
 mount -o remount,rw /
-mv /usr/apps/org.tizen.calendar/ /usr/apps/org.tizen.calendar2
+#mv /usr/apps/org.tizen.calendar/ /usr/apps/org.tizen.calendar2
 
 
 BATCH_FILE=$(readlink -f "$1")

diff --git a/src/batch/run-batch.bat b/src/batch/run-batch.bat
index d9523288c4ed99c7115e50c5d76ca1ff1faefa86..5f6ae5cec64ce6fc95babad6378e1dbc0fc17d2d 100644 (file)
--- a/src/batch/run-batch.bat
+++ b/src/batch/run-batch.bat
@@ -11,18 +11,9 @@ set BATCH_FILE_NAME=%~n1
 \r
 set TMP=/opt/usr/home/owner/media/Documents/\r
 \r
-sdb root on\r
-sdb shell mount -o remount,rw /\r
-\r
-sdb push %BATCH_DIRNAME%*.rdl %TMP%\r
-sdb push %SCRIPT_DIRNAME%batch_exec.sh %TMP%\r
-\r
 :: Execute test.\r
 sdb shell "cd %TMP%; /bin/bash batch_exec.sh %BATCH_FILE_NAME%.rdl %REPEAT% %DEBUG% ; echo done"\r
 \r
 :: This was previously done with the use of project-tool.\r
 sdb root on\r
 sdb shell "journalctl --vacuum-size=1K"\r
-\r
-:: Removing batch_exec and test files.\r
-sdb shell "cd %TMP%; rm *.rdl; rm batch_exec.sh;"\r

diff --git a/src/batch/run-batch.sh b/src/batch/run-batch.sh
index 88a3cba3fe660382dbb9ab6303e27733ee2b3479..7a5fb37d62470a7501bce9cf1fdfd44d460b5ef9 100755 (executable)
--- a/src/batch/run-batch.sh
+++ b/src/batch/run-batch.sh
@@ -1,32 +1,16 @@
 #!/bin/bash
 
 BATCH_FILE=$(readlink -f "$1")
-BATCH_DIRNAME=$(dirname "$BATCH_FILE")
 BATCH_BASENAME=$(basename "$BATCH_FILE")
 SCRIPT=$(readlink -f "$0")
-SCRIPT_DIRNAME=$(dirname "$SCRIPT")
-BATCH_PATTERN='*.rdl'
-PERMISSIONS=User::Pkg::org.tizen.universal-switch::RO
 REPEAT="$2"
 DEBUG="$3"
 
-TMP=$(mktemp -d)
+TMP="/opt/usr/home/owner/media/Documents/"
 echo "tmp dir: $TMP"
 
-cd "$BATCH_DIRNAME"
-find . -name "$BATCH_PATTERN" -exec cp --parents {} "$TMP"  ";"
-cp "$BATCH_FILE" "$TMP"
-cp "$SCRIPT_DIRNAME/batch_exec.sh" "$TMP"
-sdb root on
-sdb push $TMP $TMP
-sdb shell chsmack -ra $PERMISSIONS "$TMP"
-
-
 cd $(dirname "$SCRIPT")
 cd ../..
 ./project-tool -j
 
 sdb shell "cd $TMP; /bin/bash batch_exec.sh $TMP/$BATCH_BASENAME $REPEAT $DEBUG ; echo done"
-
-rm -r "$TMP"
-sdb shell "rm -r $TMP"
\ No newline at end of file

diff --git a/src/batch/run-setup.bat b/src/batch/run-setup.bat
new file mode 100644 (file)
index 0000000..59320e6
--- /dev/null
+++ b/src/batch/run-setup.bat
@@ -0,0 +1,21 @@
+@echo off\r
+\r
+set SCRIPT=%0\r
+set BATCH_FILE=%1\r
+set REPEAT=%2\r
+set DEBUG=%3\r
+\r
+set SCRIPT_DIRNAME=%~dp0\r
+set BATCH_DIRNAME=%~dp1\r
+set BATCH_FILE_NAME=%~n1\r
+\r
+set TMP=/opt/usr/home/owner/media/Documents/\r
+\r
+sdb root on\r
+sdb shell mount -o remount,rw /\r
+\r
+:: Removing batch_exec and test files.\r
+sdb shell "cd %TMP%; rm *.rdl; rm batch_exec.sh;"\r
+\r
+sdb push %BATCH_DIRNAME%*.rdl %TMP%\r
+sdb push %SCRIPT_DIRNAME%batch_exec.sh %TMP%\r

diff --git a/src/batch/run-setup.sh b/src/batch/run-setup.sh
new file mode 100755 (executable)
index 0000000..b4ea569
--- /dev/null
+++ b/src/batch/run-setup.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -x
+
+BATCH_FILE=$(readlink -f "$1")
+BATCH_DIRNAME=$(dirname "$BATCH_FILE")
+SCRIPT=$(readlink -f "$0")
+SCRIPT_DIRNAME=$(dirname "$SCRIPT")
+BATCH_PATTERN='*.rdl'
+#PERMISSIONS=User::Pkg::org.tizen.universal-switch::RO
+
+TARGET_TMP="/opt/usr/home/owner/media/Documents/"
+TMP="/tmp/sr-tests"
+
+echo "tmp dir: $TMP"
+
+rm -r "$TMP"
+mkdir "$TMP"
+
+sdb shell "rm -r $TARGET_TMP"
+sdb shell "mkdir $TARGET_TMP"
+
+cd "$BATCH_DIRNAME"
+find . -name "$BATCH_PATTERN" -exec cp --parents {} "$TMP"  ";"
+cp "$BATCH_FILE" "$TMP"
+cp "$SCRIPT_DIRNAME/batch_exec.sh" "$TMP"
+
+sdb root on
+sdb shell mount -o remount,rw /
+sdb push $TMP $TARGET_TMP
+#sdb shell chsmack -ra $PERMISSIONS "$TMP"
+
+rm -r "$TMP"