Removed m0 unsupported features

Change-Id: Idb359ee66ec036fba9c30280be37d659429a8751
Signed-off-by: Keebong <keebong.bahn@samsung.com>

diff --git a/data/capability.conf b/data/capability.conf
index 1e13bb2..dd50424 100644 (file)
--- a/data/capability.conf
+++ b/data/capability.conf
@@ -45,5 +45,4 @@ http://tizen.org/feature/graphics.acceleration
 http://tizen.org/feature/screen.auto_rotation
 http://tizen.org/feature/network.telephony
 http://tizen.org/feature/network.telephony.mms
-http://tizen.org/feature/network.telephony.sms.cbs
 http://tizen.org/feature/shell.appwidget

diff --git a/data/capability_emul.conf b/data/capability_emul.conf
index e6b88c7..fee58d8 100644 (file)
--- a/data/capability_emul.conf
+++ b/data/capability_emul.conf
@@ -25,7 +25,6 @@ http://tizen.org/feature/sensor.photometer
 http://tizen.org/feature/sensor.proximity
 http://tizen.org/feature/sensor.tiltmeter
 http://tizen.org/feature/sip.voip
-http://tizen.org/feature/speech.recognition
 http://tizen.org/feature/speech.synthesis
 http://tizen.org/feature/network.telephony
 http://tizen.org/feature/network.telephony.service.umts

diff --git a/data/capability_m0_modem.conf b/data/capability_m0_modem.conf
index 3b539a5..b6461ae 100644 (file)
--- a/data/capability_m0_modem.conf
+++ b/data/capability_m0_modem.conf
@@ -26,7 +26,6 @@ http://tizen.org/feature/sensor.photometer
 http://tizen.org/feature/sensor.proximity
 http://tizen.org/feature/sensor.tiltmeter
 http://tizen.org/feature/sip.voip
-http://tizen.org/feature/speech.recognition
 http://tizen.org/feature/speech.synthesis
 http://tizen.org/feature/usb.accessory
 http://tizen.org/feature/usb.host
@@ -43,5 +42,4 @@ http://tizen.org/feature/graphics.acceleration
 http://tizen.org/feature/screen.auto_rotation
 http://tizen.org/feature/network.telephony
 http://tizen.org/feature/network.telephony.mms
-http://tizen.org/feature/network.telephony.sms.cbs
 http://tizen.org/feature/shell.appwidget

diff --git a/packaging/apps.FtApp.spec b/packaging/FtApp.spec
similarity index 98%
rename from packaging/apps.FtApp.spec
rename to packaging/FtApp.spec
index c5ef7ae..7c2f77e 100755 (executable)
--- a/packaging/apps.FtApp.spec
+++ b/packaging/FtApp.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 %define __strip /bin/true
 
-Name:       apps.FtApp
+Name:       FtApp
 Summary:    FtApp application
 Version:    1.2.1.0
 Release:    1

diff --git a/util/check_push_server.sh b/util/check_push_server.sh
new file mode 100755 (executable)
index 0000000..3125954
--- /dev/null
+++ b/util/check_push_server.sh
@@ -0,0 +1,21 @@
+echo -- start to check push server
+
+SDB=$1
+
+PushServer=`$SDB shell 'vconftool get file/private/push-bin/ip_pv' | awk '{print $4}'`
+
+if [ $PushServer = "175.41.248.198" ]
+then
+       echo already set as staging server
+else
+       echo change to staging server
+       $SDB shell '/etc/init.d/pushd stop'
+       $SDB shell 'vconftool set -t string file/private/push-bin/ip_pv 175.41.248.198 -f'
+       $SDB shell 'vconftool set -t int file/private/push-bin/port_pv 5223 -f'
+       $SDB shell 'vconftool unset file/private/push-bin/devtk'
+       $SDB shell '/etc/init.d/pushd start; sleep 5; exit 0'
+       echo done
+fi
+
+echo -- done to check push server
+

diff --git a/util/copy_so_conf.sh b/util/copy_so_conf.sh
new file mode 100755 (executable)
index 0000000..1669659
--- /dev/null
+++ b/util/copy_so_conf.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# move this file to the directory in which unit-ts rpm is extracted
+# usage : copy_so_conf.sh [option]
+# [option]
+# emul         for emulator
+# target       for target
+
+cp *.so ~/cts_tool/workspace/CTS_workspace/TC/$1/UnitTest
+cp *.conf ~/cts_tool/workspace/CTS_workspace/TC/$1/UnitTest

diff --git a/util/demon_emulwvga.sh b/util/demon_emulwvga.sh
new file mode 100755 (executable)
index 0000000..a53435d
--- /dev/null
+++ b/util/demon_emulwvga.sh
@@ -0,0 +1,51 @@
+       #!/bin/bash
+# eonseok.lee
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+SDB="${PWD}/../../sdk/Linux/Tools/sdb/sdb -e"
+
+# install osp-app-service
+OSP_DAEMON_NAME=osp-app-service
+OSP_DAEMON_APPID=aospd00043
+echo "install $OSP_DAEMON_NAME"
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/${OSP_DAEMON_APPID}"
+
+$SDB shell "rm -f /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh"
+echo "#!/bin/sh
+/opt/osp/applications/${OSP_DAEMON_APPID}/Bin/${OSP_DAEMON_NAME}&" > ${OSP_DAEMON_NAME}.sh
+$SDB push ${OSP_DAEMON_NAME}.sh /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh
+rm ${OSP_DAEMON_NAME}.sh
+$SDB shell "chmod +x /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh"
+
+$SDB shell "rm -f /etc/rc.d/rc3.d/S99${OSP_DAEMON_NAME}"
+$SDB shell "ln -s /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh /etc/rc.d/rc3.d/S99${OSP_DAEMON_NAME}"
+
+
+# OspCommerceD
+echo "install OspCommerceD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/33kaymt1s3"
+
+# OspContentD
+#echo "install OspContentD"
+#sleep 5
+#$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/5z937vtebp"
+
+# OspLocationD
+echo "install OspLocationD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/800ij447xl"
+
+# OspPrivMgrD
+echo "install OspPrivMgrD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/q7097a278m"
+
+# OspPushD
+echo "install OspPushD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/j3evfhhr1c"
+

diff --git a/util/demon_u1.sh b/util/demon_u1.sh
new file mode 100755 (executable)
index 0000000..5fe2280
--- /dev/null
+++ b/util/demon_u1.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# eonseok.lee
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+SDB="${PWD}/../../sdk/Linux/Tools/sdb/sdb -d"
+
+# change-booting-mode
+$SDB shell "change-booting-mode.sh --update"
+
+# install OspAppMgrD
+OSP_DAEMON_NAME=osp-app-service
+OSP_DAEMON_APPID=aospd00043
+echo "install $OSP_DAEMON_NAME"
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/${OSP_DAEMON_APPID}"
+
+$SDB shell "rm -f /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh"
+echo "#!/bin/sh
+/opt/osp/applications/${OSP_DAEMON_APPID}/Bin/${OSP_DAEMON_NAME}&" > ${OSP_DAEMON_NAME}.sh
+$SDB push ${OSP_DAEMON_NAME}.sh /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh
+rm ${OSP_DAEMON_NAME}.sh
+$SDB shell "chmod +x /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh"
+
+$SDB shell "rm -f /etc/rc.d/rc3.d/S99${OSP_DAEMON_NAME}"
+$SDB shell "ln -s /etc/rc.d/init.d/${OSP_DAEMON_NAME}.sh /etc/rc.d/rc3.d/S99${OSP_DAEMON_NAME}"
+
+# OspCommerceD
+echo "install OspCommerceD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/33kaymt1s3"
+
+# OspContentD
+#echo "install OspContentD"
+#sleep 5
+#$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/5z937vtebp"
+
+# OspLocationD
+echo "install OspLocationD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/800ij447xl"
+
+# OspPrivMgrD
+echo "install OspPrivMgrD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/q7097a278m"
+
+# OspPushD
+echo "install OspPushD"
+sleep 5
+$SDB shell "/usr/etc/package-manager/frontend/ospinstallerf -i /opt/osp/applications/j3evfhhr1c"
+

diff --git a/util/ftapput_emulwvga.sh b/util/ftapput_emulwvga.sh
new file mode 100755 (executable)
index 0000000..0fafb28
--- /dev/null
+++ b/util/ftapput_emulwvga.sh
@@ -0,0 +1,105 @@
+#!/bin/bash
+#jun.jaygarl
+
+echo
+echo "Use run_ftapp.sh script"
+echo "./run_ftapp.sh -h helps you"
+echo
+
+exit
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+LIBDIR="../../../../usr/lib/osp/unit-ts"
+LOGDIR="$SCPDIR/testlogs_emulwvga"
+UTILDIR="${PWD}/../osp-test-utility"
+cd
+SDB="${PWD}/tizen-sdk/tools/sdb -e"
+
+echo -- bada 3.0 auto test script v0.1 --
+echo -- please run emulator first --
+echo
+
+#cd $WRKDIR/target/emulator
+
+cd $PWDDIR
+
+
+#$SDB shell 'mkdir /system-rw/data/credential'
+
+echo -- copy UTsMediaRegTarget.ini
+$SDB push $WRKDIR/test/osp-uts-media/osp-uts-media-common/UTsMediaRegTarget.ini  /home/UTsMediaRegTarget.ini
+echo 
+
+echo -- create a testlog directory
+#rm -rf $LOGDIR 
+mkdir $LOGDIR
+echo mkdir $LOGDIR
+
+echo -- copy rootcas of uts-security TestCases
+$SDB push $WRKDIR/test/osp-uts-security/resources/root-ca/Cingular_Trusted_RCA.der /usr/share/cert-svc/ca-certs/code-signing/debian/Cingular_Trusted_RCA.der
+$SDB push $WRKDIR/test/osp-uts-security/resources/root-ca/Samsung_Certificate_Authority.der /usr/share/cert-svc/ca-certs/code-signing/debian/Samsung_Certificate_Authority.der
+
+echo -- set location setting enabled for osp-uts-locations
+$SDB shell 'vconftool set -t int db/location/setting/GpsEnabled 1 -f'
+$SDB shell 'vconftool set -t int db/location/setting/NetworkEnabled 1 -f'
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+
+echo -- read test suite list
+for TESTSUITE in `cat $SCPDIR/tslist.txt`
+do
+
+  echo 
+  echo ==================================
+  echo ====    "$TESTSUITE"
+  echo ==================================
+  echo
+
+  TSLIB=lib$TESTSUITE.so
+  TSCONF=$TESTSUITE.conf
+  echo -- copy test suites "$TESTSUITE"
+  echo $SDB push $LIBDIR/$TSLIB /opt/apps/org.tizen.2s4jm6firv/data/
+  $SDB push $LIBDIR/$TSLIB /opt/apps/org.tizen.2s4jm6firv/data/
+  echo $SDB push $LIBDIR/$TSCONF /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.conf
+  $SDB push $LIBDIR/$TSCONF /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.conf
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- run the location injector for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+       cd $UTILDIR/location-injector
+    ./start-emulator.sh
+       cd $PWDDIR
+  fi
+
+  echo -- run ftapp
+  echo $SDB shell "/opt/apps/org.tizen.2s4jm6firv/bin/FtApp.exe"
+  $SDB shell "/opt/apps/org.tizen.2s4jm6firv/bin/FtApp.exe"
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- terminate the location injector
+       cd $UTILDIR/location-injector
+    ./stop-emulator.sh
+       cd $PWDDIR
+  fi
+
+  echo -- copy logfile
+  NOW=$(date +"%H%M%S_%y%j")
+  echo  $SDB push /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  $SDB pull /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  echo  $SDB shell "rm /opt/apps/org.tizen.2s4jm6firv/data/lib${TESTSUITE}.so"
+  $SDB shell "rm /opt/apps/org.tizen.2s4jm6firv/data/lib${TESTSUITE}.so"
+  echo
+  echo
+
+done
+
+
+
+echo -- end test

diff --git a/util/ftapput_emulwvga_callgrind.sh b/util/ftapput_emulwvga_callgrind.sh
new file mode 100755 (executable)
index 0000000..6458021
--- /dev/null
+++ b/util/ftapput_emulwvga_callgrind.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+#jun.jaygarl
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+LIBDIR="$WRKDIR/target/emulator/lib"
+LOGDIR="$SCPDIR/testlogs_emulwvga"
+VALGRINDDIR="$SCPDIR/valgrind_emulwvga"
+CALLGRINDDIR="$SCPDIR/callgrind_emulwvga"
+UTILDIR="${PWD}/../osp-test-utility"
+SDB="${PWD}/../../sdk/linux/tools/sdb/sdb -e"
+
+if [ "$#" != 1 ]; then
+       echo Usage : ./ftapput_emulwvga_callgrind.sh {test-uts-name}
+       exit
+fi
+
+TESTSUITE=$1
+
+echo -- bada 3.0 auto test script v0.1 --
+echo -- please run emulator first --
+echo
+
+mkdir $CALLGRINDDIR
+
+cd $WRKDIR/target/emulator
+
+cd $PWDDIR
+
+
+$SDB shell 'mkdir /system-rw/data/credential'
+
+echo -- copy callgrind-x86-linux
+$SDB push $WRKDIR/target/emulator/util/callgrind-x86-linux /usr/lib/valgrind/
+echo -- copy UTsMediaRegTarget.ini
+$SDB push $WRKDIR/test/unit-ts/uts-media-common/UTsMediaRegTarget.ini  /home/UTsMediaRegTarget.ini
+echo 
+
+echo -- create a testlog directory
+#rm -rf $LOGDIR 
+mkdir $LOGDIR
+echo mkdir $LOGDIR
+
+echo -- copy rootcas of uts-security TestCases
+$SDB push $WRKDIR/test/unit-ts/resources/uts-security/root-ca/Cingular_Trusted_RCA.der /usr/share/cert-svc/ca-certs/code-signing/debian/Cingular_Trusted_RCA.der
+$SDB push $WRKDIR/test/unit-ts/resources/uts-security/root-ca/Samsung_Certificate_Authority.der /usr/share/cert-svc/ca-certs/code-signing/debian/Samsung_Certificate_Authority.der
+
+echo -- set location setting enabled for osp-uts-locations
+$SDB shell 'vconftool set -t int db/location/setting/GpsEnabled 1'
+$SDB shell 'vconftool set -t int db/location/setting/NetworkEnabled 1'
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+
+echo -- read test suite list
+
+echo 
+echo ==================================
+echo ====    "$TESTSUITE"
+echo ==================================
+echo
+
+TSLIB=lib$TESTSUITE.so
+TSCONF=$TESTSUITE.conf
+echo -- copy test suites "$TESTSUITE"
+echo $SDB push $LIBDIR/unit-ts/$TSLIB /opt/osp/applications/2s4jm6firv/data/
+$SDB push $LIBDIR/unit-ts/$TSLIB /opt/osp/applications/2s4jm6firv/data/  
+echo $SDB push $LIBDIR/unit-ts/$TSCONF /opt/osp/applications/2s4jm6firv/data/ftapputs.conf 
+$SDB push $LIBDIR/unit-ts/$TSCONF /opt/osp/applications/2s4jm6firv/data/ftapputs.conf 
+echo
+
+if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+then
+  echo -- run the location injector for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+       cd $UTILDIR/location-injector
+  ./start-emulator.sh
+       cd $PWDDIR
+fi
+
+echo -- run ftapp
+echo $SDB shell "valgrind --tool=callgrind --log-file="callgrind-log.txt" /opt/osp/applications/2s4jm6firv/bin/FtApp" | tee temp.txt
+$SDB shell "valgrind --tool=callgrind --log-file="callgrind-log.txt" /opt/osp/applications/2s4jm6firv/bin/FtApp" | tee temp.txt
+$SDB shell rm "callgrind*"
+python ./../../target/emulator/util/extract-callgrind-info.py
+rm temp.txt
+mv $SCPDIR/callgrind.out $CALLGRINDDIR/${TESTSUITE}_callgrind.out
+echo
+  
+if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+then
+  echo -- terminate the location injector
+       cd $UTILDIR/location-injector
+  ./stop-emulator.sh
+       cd $PWDDIR
+fi
+
+echo -- copy logfile 
+NOW=$(date +"%H%M%S_%y%j")
+echo  $SDB push /opt/osp/applications/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+$SDB pull /opt/osp/applications/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  
+echo  $SDB shell "rm /opt/osp/applications/2s4jm6firv/data/lib${TESTSUITE}.so"
+$SDB shell "rm /opt/osp/applications/2s4jm6firv/data/lib${TESTSUITE}.so"
+echo
+echo 
+  
+
+
+
+    
+echo -- end test

diff --git a/util/ftapput_emulwvga_cts.sh b/util/ftapput_emulwvga_cts.sh
new file mode 100755 (executable)
index 0000000..7d903f7
--- /dev/null
+++ b/util/ftapput_emulwvga_cts.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+#jun.jaygarl
+
+#SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+#WRKDIR="$PWDDIR/../.."
+#LIBDIR="$WRKDIR/target/emulator/lib"
+#LOGDIR="$SCPDIR/testlogs_emulwvga"
+#UTILDIR="${PWD}/../osp-test-utility"
+cd
+SDB="${PWD}/tizen-sdk/tools/sdb -e"
+
+echo "-- Tizen 2.0 CTS pre-condition setting script --"
+echo
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+

diff --git a/util/ftapput_emulwvga_valgrind.sh b/util/ftapput_emulwvga_valgrind.sh
new file mode 100644 (file)
index 0000000..a5d9667
--- /dev/null
+++ b/util/ftapput_emulwvga_valgrind.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+#jun.jaygarl
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+LIBDIR="$WRKDIR/target/emulator/lib"
+LOGDIR="$SCPDIR/testlogs_emulwvga"
+VALGRINDDIR="$SCPDIR/valgrind_emulwvga"
+UTILDIR="${PWD}/../osp-test-utility"
+SDB="${PWD}/../../sdk/linux/tools/sdb/sdb -e"
+
+echo -- bada 3.0 auto test script v0.1 --
+echo -- please run emulator first --
+echo
+
+cd $WRKDIR/target/emulator
+
+cd $PWDDIR
+
+
+$SDB shell 'mkdir /system-rw/data/credential'
+
+echo -- copy UTsMediaRegTarget.ini
+$SDB push $WRKDIR/test/unit-ts/uts-media-common/UTsMediaRegTarget.ini  /home/UTsMediaRegTarget.ini
+echo 
+
+echo -- create a testlog directory
+#rm -rf $LOGDIR 
+mkdir $LOGDIR
+echo mkdir $LOGDIR
+
+echo -- copy rootcas of uts-security TestCases
+$SDB push $WRKDIR/test/unit-ts/resources/uts-security/root-ca/Cingular_Trusted_RCA.der /usr/share/cert-svc/ca-certs/code-signing/debian/Cingular_Trusted_RCA.der
+$SDB push $WRKDIR/test/unit-ts/resources/uts-security/root-ca/Samsung_Certificate_Authority.der /usr/share/cert-svc/ca-certs/code-signing/debian/Samsung_Certificate_Authority.der
+
+echo -- set location setting enabled for uts-locations
+$SDB shell 'vconftool set -t int db/location/setting/GpsEnabled 1'
+$SDB shell 'vconftool set -t int db/location/setting/NetworkEnabled 1'
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+
+echo -- read test suite list
+for TESTSUITE in `cat $SCPDIR/tslist.txt`
+do
+
+  echo 
+  echo ==================================
+  echo ====    "$TESTSUITE"
+  echo ==================================
+  echo
+
+  TSLIB=lib$TESTSUITE.so
+  TSCONF=$TESTSUITE.conf
+  echo -- copy test suites "$TESTSUITE"
+  echo $SDB push $LIBDIR/unit-ts/$TSLIB /opt/osp/applications/2s4jm6firv/data/
+  $SDB push $LIBDIR/unit-ts/$TSLIB /opt/osp/applications/2s4jm6firv/data/  
+  echo $SDB push $LIBDIR/unit-ts/$TSCONF /opt/osp/applications/2s4jm6firv/data/ftapputs.conf 
+  $SDB push $LIBDIR/unit-ts/$TSCONF /opt/osp/applications/2s4jm6firv/data/ftapputs.conf 
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- run the location injector for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+       cd $UTILDIR/location-injector
+    ./start-emulator.sh
+       cd $PWDDIR
+  fi
+
+  echo -- run ftapp
+  echo $SDB shell "valgrind --leak-check=full --show-reachable=no --run-libc-freeres=yes --log-file="${TESTSUITE}_valgrind.txt" /opt/osp/applications/2s4jm6firv/bin/FtApp"
+  $SDB shell "valgrind --leak-check=full --show-reachable=no --run-libc-freeres=yes --log-file="${TESTSUITE}_valgrind.txt" /opt/osp/applications/2s4jm6firv/bin/FtApp"
+  echo
+  
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- terminate the location injector
+       cd $UTILDIR/location-injector
+    ./stop-emulator.sh
+       cd $PWDDIR
+  fi
+
+  echo -- copy logfile 
+  NOW=$(date +"%H%M%S_%y%j")
+  echo  $SDB push /opt/osp/applications/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  $SDB pull /opt/osp/applications/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  
+  echo $SDB "pull "${TESTSUITE}_valgrind.txt ${VALGRINDDIR}/${TESTSUITE}"_valgrind_"$NOW.txt
+  $SDB pull ${TESTSUITE}_valgrind.txt ${VALGRINDDIR}/${TESTSUITE}_valgrind_$NOW.txt
+  echo  $SDB shell "rm ${TESTSUITE}_valgrind.txt"
+  $SDB shell "rm ${TESTSUITE}_valgrind.txt"
+  
+  echo  $SDB shell "rm /opt/osp/applications/2s4jm6firv/data/lib${TESTSUITE}.so"
+  $SDB shell "rm /opt/osp/applications/2s4jm6firv/data/lib${TESTSUITE}.so"
+  echo
+  echo 
+  
+done 
+
+
+    
+echo -- end test

diff --git a/util/ftapput_u1.sh b/util/ftapput_u1.sh
new file mode 100755 (executable)
index 0000000..b2594da
--- /dev/null
+++ b/util/ftapput_u1.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+#jun.jaygarl
+
+echo
+echo "Use run_ftapp.sh script"
+echo "./run_ftapp.sh -h helps you"
+echo
+
+exit
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+LIBDIR="../../../../usr/lib/osp/unit-ts"
+LOGDIR="$SCPDIR/testlogs_u1"
+UTILDIR="${PWD}/../osp-test-utility"
+cd
+SDB="${PWD}/tizen-sdk/tools/sdb -d"
+
+echo -- bada 3.0 auto test script v0.1 --
+echo -- please run emulator first --
+echo
+
+# change-booting-mode
+$SDB shell "change-booting-mode.sh --update"
+
+#cd $WRKDIR/target/u1
+
+cd $PWDDIR
+
+#$SDB shell 'mkdir /system-rw/data/credential'
+
+echo -- copy UTsMediaRegTarget.ini
+$SDB push $WRKDIR/test/osp-uts-media/osp-uts-media-common/UTsMediaRegTarget.ini  /home/UTsMediaRegTarget.ini
+echo
+
+echo -- create a testlog directory
+#rm -rf $LOGDIR 
+mkdir $LOGDIR
+echo mkdir $LOGDIR
+
+echo -- copy rootcas of uts-security TestCases
+$SDB push $WRKDIR/test/osp-uts-security/resources/root-ca/Cingular_Trusted_RCA.der /usr/share/cert-svc/ca-certs/code-signing/debian/Cingular_Trusted_RCA.der
+$SDB push $WRKDIR/test/osp-uts-security/resources/root-ca/Samsung_Certificate_Authority.der /usr/share/cert-svc/ca-certs/code-signing/debian/Samsung_Certificate_Authority.der
+
+echo -- set location setting enabled for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+$SDB shell 'vconftool set -t int db/location/setting/GpsEnabled 1 -f'
+$SDB shell 'vconftool set -t int db/location/setting/NetworkEnabled 1 -f'
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+
+echo -- read test suite list
+for TESTSUITE in `cat $SCPDIR/tslist.txt`
+do
+
+  echo 
+  echo ==================================
+  echo ====    "$TESTSUITE"
+  echo ==================================
+  echo
+
+  TSLIB=lib$TESTSUITE.so
+  TSCONF=$TESTSUITE.conf
+  echo -- copy test suites "$TESTSUITE"
+  echo $SDB push $LIBDIR/$TSLIB /opt/apps/org.tizen.2s4jm6firv/data/
+  $SDB push $LIBDIR/$TSLIB /opt/apps/org.tizen.2s4jm6firv/data/  
+  echo $SDB push $LIBDIR/$TSCONF /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.conf 
+  $SDB push $LIBDIR/$TSCONF /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.conf 
+  echo
+  
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- run the location injector for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+       cd $UTILDIR/location-injector
+    ./start-u1.sh
+       cd $PWDDIR
+  fi
+
+  echo -- run ftapp
+  echo $SDB shell "/opt/apps/org.tizen.2s4jm6firv/bin/FtApp.exe"
+  $SDB shell "/opt/apps/org.tizen.2s4jm6firv/bin/FtApp.exe"
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- terminate the location injector
+       cd $UTILDIR/location-injector
+    ./stop-u1.sh
+       cd $PWDDIR
+  fi
+  
+  echo -- copy logfile 
+  NOW=$(date +"%H%M%S_%y%j")
+  echo $SDB pull /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  $SDB pull /opt/apps/org.tizen.2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  echo $SDB shell "rm /opt/apps/org.tizen.2s4jm6firv/data/lib${TESTSUITE}.so"
+  $SDB shell "rm /opt/apps/org.tizen.2s4jm6firv/data/lib${TESTSUITE}.so"
+
+  echo
+  echo 
+  
+done 
+
+echo -- end test

diff --git a/util/ftapput_u1_cts.sh b/util/ftapput_u1_cts.sh
new file mode 100755 (executable)
index 0000000..4db65e9
--- /dev/null
+++ b/util/ftapput_u1_cts.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#jun.jaygarl
+
+#SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+#WRKDIR="$PWDDIR/../.."
+#LIBDIR="$WRKDIR/target/u1/lib"
+#LOGDIR="$SCPDIR/testlogs_u1"
+#UTILDIR="${PWD}/../osp-test-utility"
+cd
+SDB="${PWD}/tizen-sdk/tools/sdb -d"
+
+echo "-- Tizen 2.0 CTS pre-condition setting script --"
+echo
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &

diff --git a/util/ftapput_u1_valgrind.sh b/util/ftapput_u1_valgrind.sh
new file mode 100644 (file)
index 0000000..5d6ffa7
--- /dev/null
+++ b/util/ftapput_u1_valgrind.sh
@@ -0,0 +1,105 @@
+#!/bin/bash
+#jun.jaygarl
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+LIBDIR="$WRKDIR/target/u1/lib"
+LOGDIR="$SCPDIR/testlogs_u1"
+VALGRINDDIR="$SCPDIR/valgrind_u1"
+UTILDIR="${PWD}/../osp-test-utility"
+SDB="${PWD}/../../sdk/linux/tools/sdb/sdb -d"
+
+echo -- bada 3.0 auto test script v0.1 --
+echo -- please run emulator first --
+echo
+
+# change-booting-mode
+$SDB shell "change-booting-mode.sh --update"
+
+cd $WRKDIR/target/u1
+
+cd $PWDDIR
+
+$SDB shell 'mkdir /system-rw/data/credential'
+
+echo -- copy UTsMediaRegTarget.ini
+$SDB push $WRKDIR/test/unit-ts/uts-media-common/UTsMediaRegTarget.ini /home/UTsMediaRegTarget.ini
+echo
+
+echo -- create a testlog directory
+#rm -rf $LOGDIR 
+mkdir $LOGDIR
+echo mkdir $LOGDIR
+
+echo -- copy rootcas of uts-security TestCases
+$SDB push $WRKDIR/test/unit-ts/resources/uts-security/root-ca/Cingular_Trusted_RCA.der /usr/share/cert-svc/ca-certs/code-signing/debian/Cingular_Trusted_RCA.der
+$SDB push $WRKDIR/test/unit-ts/resources/uts-security/root-ca/Samsung_Certificate_Authority.der /usr/share/cert-svc/ca-certs/code-signing/debian/Samsung_Certificate_Authority.der
+
+echo -- set location setting enabled for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+$SDB shell 'vconftool set -t int db/location/setting/GpsEnabled 1'
+$SDB shell 'vconftool set -t int db/location/setting/NetworkEnabled 1'
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+
+echo -- read test suite list
+for TESTSUITE in `cat $SCPDIR/tslist.txt`
+do
+
+  echo 
+  echo ==================================
+  echo ====    "$TESTSUITE"
+  echo ==================================
+  echo
+
+  TSLIB=lib$TESTSUITE.so
+  TSCONF=$TESTSUITE.conf
+  echo -- copy test suites "$TESTSUITE"
+  echo $SDB push $LIBDIR/unit-ts/$TSLIB /opt/osp/applications/2s4jm6firv/data/
+  $SDB push $LIBDIR/unit-ts/$TSLIB /opt/osp/applications/2s4jm6firv/data/  
+  echo $SDB push $LIBDIR/unit-ts/$TSCONF /opt/osp/applications/2s4jm6firv/data/ftapputs.conf 
+  $SDB push $LIBDIR/unit-ts/$TSCONF /opt/osp/applications/2s4jm6firv/data/ftapputs.conf 
+  echo
+  
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- run the location injector for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+       cd $UTILDIR/location-injector
+    ./start-u1.sh
+       cd $PWDDIR
+  fi
+
+  echo -- run ftapp
+  echo $SDB shell "valgrind --leak-check=full --show-reachable=no --run-libc-freeres=yes --log-file="${TESTSUITE}_valgrind.txt" /opt/osp/applications/2s4jm6firv/bin/FtApp"
+  $SDB shell "valgrind --leak-check=full --show-reachable=no --run-libc-freeres=yes --log-file="${TESTSUITE}_valgrind.txt" /opt/osp/applications/2s4jm6firv/bin/FtApp"
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- terminate the location injector
+       cd $UTILDIR/location-injector
+    ./stop-u1.sh
+       cd $PWDDIR
+  fi
+  
+  echo -- copy logfile 
+  NOW=$(date +"%H%M%S_%y%j")
+  echo $SDB pull /opt/osp/applications/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  $SDB pull /opt/osp/applications/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  
+  echo $SDB "pull "${TESTSUITE}_valgrind.txt ${VALGRINDDIR}/${TESTSUITE}"_valgrind_"$NOW.txt
+  $SDB pull ${TESTSUITE}_valgrind.txt ${VALGRINDDIR}/${TESTSUITE}_valgrind_$NOW.txt
+  echo  $SDB shell "rm ${TESTSUITE}_valgrind.txt"
+  $SDB shell "rm ${TESTSUITE}_valgrind.txt"
+
+  echo $SDB shell "rm /opt/osp/applications/2s4jm6firv/data/lib${TESTSUITE}.so"
+  $SDB shell "rm /opt/osp/applications/2s4jm6firv/data/lib${TESTSUITE}.so"
+
+  echo
+  echo 
+  
+done 
+
+echo -- end test

diff --git a/gen_multi_priv_pkg.sh b/util/gen_multi_priv_pkg.sh
similarity index 98%
rename from gen_multi_priv_pkg.sh
rename to util/gen_multi_priv_pkg.sh
index a081459..15f17ab 100755 (executable)
--- a/gen_multi_priv_pkg.sh
+++ b/util/gen_multi_priv_pkg.sh
@@ -110,7 +110,7 @@ tmp="<Privilege>http://tizen.org/privilege/callforward"
 cmd="/<Privileges>$/ a $tmp"
 cmd2="</Privilege>"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
-tmp="<Privilege>http://tizen.org/privilege/settingmanager.wirte"
+tmp="<Privilege>http://tizen.org/privilege/settingmanager.write"
 cmd="/<Privileges>$/ a $tmp"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
 zip -r ../FtApp-2callfwd-settingw.zip bin data info lib res shared author-signature.xml signature1.xml
@@ -368,7 +368,7 @@ sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
 tmp="<Privilege>http://tizen.org/privilege/settingmanager.read"
 cmd="/<Privileges>$/ a $tmp"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
-tmp="<Privilege>http://tizen.org/privilege/settingmanager.wirte"
+tmp="<Privilege>http://tizen.org/privilege/settingmanager.write"
 cmd="/<Privileges>$/ a $tmp"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
 zip -r ../FtApp-3setting-manager-rw.zip bin data info lib res shared author-signature.xml signature1.xml
@@ -381,7 +381,7 @@ chmod +x ../FtApp-hwon-3setting-manager-rw.tpk
 
 sed  -i 's/HwAcceleration="On"/HwAcceleration="Off"/g' ${current_path}/info/manifest.xml
 sed -i /\<Privilege\>/d ${current_path}/info/manifest.xml
-tmp="<Privilege>http://tizen.org/privilege/settingmanager.wirte"
+tmp="<Privilege>http://tizen.org/privilege/settingmanager.write"
 cmd="/<Privileges>$/ a $tmp"
 cmd2="</Privilege>"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
@@ -398,7 +398,7 @@ chmod +x ../FtApp-hwon-2setting-system-manager.tpk
 
 sed  -i 's/HwAcceleration="On"/HwAcceleration="Off"/g' ${current_path}/info/manifest.xml
 sed -i /\<Privilege\>/d ${current_path}/info/manifest.xml
-tmp="<Privilege>http://tizen.org/privilege/settingmanager.wirte"
+tmp="<Privilege>http://tizen.org/privilege/settingmanager.write"
 cmd="/<Privileges>$/ a $tmp"
 cmd2="</Privilege>"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
@@ -415,7 +415,7 @@ chmod +x ../FtApp-hwon-2settingw-telephony.tpk
 
 sed  -i 's/HwAcceleration="On"/HwAcceleration="Off"/g' ${current_path}/info/manifest.xml
 sed -i /\<Privilege\>/d ${current_path}/info/manifest.xml
-tmp="<Privilege>http://tizen.org/privilege/settingmanager.wirte"
+tmp="<Privilege>http://tizen.org/privilege/settingmanager.write"
 cmd="/<Privileges>$/ a $tmp"
 cmd2="</Privilege>"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml
@@ -432,7 +432,7 @@ chmod +x ../FtApp-hwon-2settingw-telephonym.tpk
 
 sed  -i 's/HwAcceleration="On"/HwAcceleration="Off"/g' ${current_path}/info/manifest.xml
 sed -i /\<Privilege\>/d ${current_path}/info/manifest.xml
-tmp="<Privilege>http://tizen.org/privilege/settingmanager.wirte"
+tmp="<Privilege>http://tizen.org/privilege/settingmanager.write"
 cmd="/<Privileges>$/ a $tmp"
 cmd2="</Privilege>"
 sed -i "${cmd}${cmd2}" ${current_path}/info/manifest.xml

diff --git a/gen_priv_pkg.sh b/util/gen_priv_pkg.sh
similarity index 100%
rename from gen_priv_pkg.sh
rename to util/gen_priv_pkg.sh

diff --git a/oscrc_tizendev b/util/oscrc_tizendev
similarity index 100%
rename from oscrc_tizendev
rename to util/oscrc_tizendev

diff --git a/privilege.list b/util/privilege.list
similarity index 97%
rename from privilege.list
rename to util/privilege.list
index 30a91e2..8786310 100644 (file)
--- a/privilege.list
+++ b/util/privilege.list
@@ -84,7 +84,7 @@ privilegemanager.read
 push
 setting
 settingmanager.read
-settingmanager.wirte
+settingmanager.write
 shortcut.install
 smstrigger
 socket
@@ -108,4 +108,4 @@ wifi.admin
 wifi.read
 wifi.wifidirect.admin
 wifi.wifidirect.read
-wifimanager
\ No newline at end of file
+wifimanager

diff --git a/util/run_ftapp.sh b/util/run_ftapp.sh
new file mode 100755 (executable)
index 0000000..0ad4b6d
--- /dev/null
+++ b/util/run_ftapp.sh
@@ -0,0 +1,127 @@
+#!/bin/bash
+#jun.jaygarl
+
+case "$1" in
+       -e)
+               echo "-- Tizen 2.0 auto test script for emulator --"
+               echo
+               LIBDIR="../../../../_builds/osp-uts-$2-i586"
+               ;;
+       -d)
+               echo "-- Tizen 2.0 auto test script for target --"
+               echo
+               LIBDIR="../../../../_builds/osp-uts-$2-armv7el"
+               ;;
+       -h)
+               echo "**********************************************"
+               echo 
+               echo "./run_ftapp.sh -e [ts_pkg] : for emulator"
+               echo "ex) ./run_ftapp.sh -e base"
+               echo    
+               echo "./run_ftapp.sh -d [ts_pkg] : for target"
+               echo "ex) ./run_ftapp.sh -d base"
+               echo 
+               echo "**********************************************"
+               exit
+               ;;
+       *)
+               echo "Invalid option"
+               exit
+               ;;
+esac
+
+SCPDIR="$( cd "$( dirname "$0" )" && pwd )"
+## set the following path as your environment
+PWDDIR=`pwd`
+WRKDIR="$PWDDIR/../.."
+#LIBDIR="../../../../usr/lib/osp/unit-ts"
+UTILDIR="${PWD}/../osp-test-utility"
+
+if [ "$1" = "-e" ]
+then
+       LOGDIR="$SCPDIR/testlogs_emulwvga"
+       cd
+       SDB="${PWD}/tizen-sdk/tools/sdb -e"
+elif [ "$1" = "-d" ]
+then
+       LOGDIR="$SCPDIR/testlogs_u1"
+       cd
+       SDB="${PWD}/tizen-sdk/tools/sdb -d"
+       $SDB shell "change-booting-mode.sh --update"
+fi
+
+cd $PWDDIR
+
+echo -- copy UTsMediaRegTarget.ini
+$SDB push $WRKDIR/cpp/osp-uts-media/osp-uts-media-common/UTsMediaRegTarget.ini  /home/UTsMediaRegTarget.ini
+echo 
+
+echo -- create a testlog directory
+mkdir $LOGDIR
+echo mkdir $LOGDIR
+
+echo -- copy rootcas of uts-security TestCases
+$SDB push $WRKDIR/cpp/osp-uts-security/resources/root-ca/Cingular_Trusted_RCA.der /usr/share/cert-svc/ca-certs/code-signing/debian/Cingular_Trusted_RCA.der
+$SDB push $WRKDIR/cpp/osp-uts-security/resources/root-ca/Samsung_Certificate_Authority.der /usr/share/cert-svc/ca-certs/code-signing/debian/Samsung_Certificate_Authority.der
+
+echo -- set location setting enabled for osp-uts-locations
+$SDB shell 'vconftool set -t int db/location/setting/GpsEnabled 1 -f'
+$SDB shell 'vconftool set -t int db/location/setting/NetworkEnabled 1 -f'
+
+echo -- check push server setting for uts-messaging
+$PWDDIR/check_push_server.sh "$SDB" &
+
+echo -- read test suite list
+for TESTSUITE in `cat $SCPDIR/tslist.txt`
+do
+
+  echo 
+  echo ==================================
+  echo ====    "$TESTSUITE"
+  echo ==================================
+  echo
+
+  TSLIB=lib$TESTSUITE.so
+  TSCONF=$TESTSUITE.conf
+  echo -- copy test suites "$TESTSUITE"
+  echo $SDB push $LIBDIR/$TSLIB /opt/apps/2s4jm6firv/data/
+  $SDB push $LIBDIR/$TSLIB /opt/apps/2s4jm6firv/data/
+  echo $SDB push $LIBDIR/$TSCONF /opt/apps/2s4jm6firv/data/ftapputs.conf
+  $SDB push $LIBDIR/$TSCONF /opt/apps/2s4jm6firv/data/ftapputs.conf
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- run the location injector for osp-uts-locations, osp-uts-locations-controls, osp-uts-locations-services
+       cd $UTILDIR/location-injector
+    ./start-emulator.sh
+       cd $PWDDIR
+  fi
+
+  echo -- run ftapp
+  echo $SDB shell "/opt/apps/2s4jm6firv/bin/FtApp"
+  $SDB shell "/opt/apps/2s4jm6firv/bin/FtApp"
+  echo
+
+  if [ "$TESTSUITE" == "osp-uts-locations" ] || [ "$TESTSUITE" == "osp-uts-locations-controls" ] || [ "$TESTSUITE" == "osp-uts-locations-services" ]
+  then
+    echo -- terminate the location injector
+       cd $UTILDIR/location-injector
+    ./stop-emulator.sh
+       cd $PWDDIR
+  fi
+
+  echo -- copy logfile
+  NOW=$(date +"%H%M%S_%y%j")
+  echo  $SDB push /opt/apps/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  $SDB pull /opt/apps/2s4jm6firv/data/ftapputs.log $LOGDIR/${TESTSUITE}_$NOW.log
+  echo  $SDB shell "rm /opt/apps/2s4jm6firv/data/lib${TESTSUITE}.so"
+  $SDB shell "rm /opt/apps/2s4jm6firv/data/lib${TESTSUITE}.so"
+  echo
+  echo
+
+done
+
+
+
+echo -- end test

diff --git a/tslist.txt b/util/tslist.txt
similarity index 100%
rename from tslist.txt
rename to util/tslist.txt