shithub: openh264

Info  •  Files  •  Log  •  Branches

ss

--- a/autotest/unitTest/run_unitTest.sh

+++ b/autotest/unitTest/run_unitTest.sh

@@ -10,43 +10,43 @@

 fi

 cd ${AUTO_TEST_PATH}

 #To find whether have android devices

-echo please set the enviroment variable as: 

-echo export ANDROID_HOME="path of android sdk" 

+echo please set the enviroment variable as:

+echo export ANDROID_HOME="path of android sdk"

 echo export ANDROID_NDK_HOME="path of android ndk"

 ANDROID_SDK_PATH=${ANDROID_HOME}

 ANDROID_NDK_PATH=${ANDROID_NDK_HOME}

 if [ "#${ANDROID_SDK_PATH}" = "#" ]

 then

-echo Please set ANDROID_HOME with the path of Android SDK 

+echo Please set ANDROID_HOME with the path of Android SDK

 exit 1

 fi

 if [ "#${ANDROID_NDK_PATH}" = "#" ]

 then

-echo Please set ANDROID_NDK_HOME with the path of Android NDK 

+echo Please set ANDROID_NDK_HOME with the path of Android NDK

 exit 1

 fi

-#prepare devices                                              

-ADB=${ANDROID_SDK_PATH}/platform-tools/adb                    

-                                                              

-#get devices                                                  

-devices=`$ADB devices | awk -F" " '/\tdevice/{print $1}'`     

-if [ "#$devices" = "#" ];then                                 

-   echo "Can not find any android devices!"                       

+#prepare devices

+ADB=${ANDROID_SDK_PATH}/platform-tools/adb

+

+#get devices

+devices=`$ADB devices | awk -F" " '/\tdevice/{print $1}'`

+if [ "#$devices" = "#" ];then

+   echo "Can not find any android devices!"

 else

    echo Start to run the unittest on android devices

-   ANDROID=1  

+   ANDROID=1

    cd ./android

    bash run_AutoTest_android.sh

    cd ${AUTO_TEST_PATH}

    if [ $? -ne 0 ];then

    echo There is something wrong happened when runing unittest on android devices,please to check

-   fi                                                     

-fi 

+   fi

+fi

 #To find whether have ios devices

  DEVICES=`system_profiler SPUSBDataType | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'`

- if [ "${DEVICES}#" == "#" ]                                                                       

- then                                                                                              

+ if [ "${DEVICES}#" == "#" ]

+ then

  echo "Can not find any connected device! please check device is connected to MAC!"

 else

   echo Start to run the unittest on ios devices

@@ -58,25 +58,25 @@

  echo There is something wrong happened when runing unittest on ios devices,please to check

  fi

 fi

-                

-#To parse the unit test result file to find whether have failures                                                            

+

+#To parse the unit test result file to find whether have failures

 if [ ${ANDROID} = "1" ];then

 bash run_ParseUTxml.sh ./android/report

 ret=$?

 if [ ${ret} -eq 0 ];then

 echo Unit test run on the android devices have not any failure case

-elif [ ${ret} -eq 2 ];then                                                                                                                                    

-echo Unit test have cases failed,please check                                                                                                             

-elif [ ${ret} -eq 1 ];then                                                                                                                                    

-echo Unit test run failed 

+elif [ ${ret} -eq 2 ];then

+echo Unit test have cases failed,please check

+elif [ ${ret} -eq 1 ];then

+echo Unit test run failed

 fi

 fi

 if [ $IOS = "1" ];then

 bash run_ParseUTxml.sh ./ios/report

-ret=$?                       

-if [ $ret -eq 0 ];then                                          

+ret=$?

+if [ $ret -eq 0 ];then

 echo Unit test run on the ios devices have not any failure case

-elif [ $ret -eq 2 ];then                                                          

+elif [ $ret -eq 2 ];then

 echo Unit test have cases failed,please check

 elif [ $ret -eq 1 ];then

 echo Unit test run failed

-- 

⑨