Updated Branches: refs/heads/develop 974fcead3 -> c9b559001
Working on getting the AIR and mobile tests to run on the VM (part 7 - full run 1). Signed-off-by: Erik de Bruin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c9b55900 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c9b55900 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c9b55900 Branch: refs/heads/develop Commit: c9b5590014826ffa358fa7a493cfee622424cf3d Parents: 974fcea Author: Erik de Bruin <[email protected]> Authored: Thu Jun 20 14:42:10 2013 +0200 Committer: Erik de Bruin <[email protected]> Committed: Thu Jun 20 14:42:23 2013 +0200 ---------------------------------------------------------------------- mustella/jenkins.sh | 76 +++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c9b55900/mustella/jenkins.sh ---------------------------------------------------------------------- diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh index 8ef619d..618758f 100755 --- a/mustella/jenkins.sh +++ b/mustella/jenkins.sh @@ -24,8 +24,8 @@ ## NOTE: this file MUST HAVE Unix style line endings! ## -export SHELLOPTS -set -o igncr +#export SHELLOPTS +#set -o igncr @@ -47,21 +47,21 @@ rm -f local.properties # MAIN -#sh ./mini_run.sh -timeout=60000 -all +sh ./mini_run.sh -timeout=60000 -all -#if [[ -s failures.txt ]] -#then -# echo "Some 'main' tests failed: running '-failures'" -# sh ./mini_run.sh -timeout=60000 -failures -# if [[ -s failures.txt ]] -# then -# MAIN_FAILED=true -# else -# echo "All 'main' tests passed after running '-failures'" -# fi -#else -# echo "All main tests passed on first run" -#fi +if [[ -s failures.txt ]] +then + echo "Some 'main' tests failed: running '-failures'" + sh ./mini_run.sh -timeout=60000 -failures + if [[ -s failures.txt ]] + then + MAIN_FAILED=true + else + echo "All 'main' tests passed after running '-failures'" + fi +else + echo "All main tests passed on first run" +fi @@ -85,30 +85,30 @@ fi # MOBILE -#cat > local.properties <<END -#target_os_name=android -#android_sdk=C:/ApacheFlex/dependencies/AndroidSDK/adt-bundle-windows-x86_64-20130522/sdk -#runtimeApk=${AIR_HOME}/runtimes/air/android/emulator/Runtime.apk -#device_name=win -#END +cat > local.properties <<END +target_os_name=android +android_sdk=C:/ApacheFlex/dependencies/AndroidSDK/adt-bundle-windows-x86_64-20130522/sdk +runtimeApk=${AIR_HOME}/runtimes/air/android/emulator/Runtime.apk +device_name=win +END -#sh ./mini_run.sh -mobile tests/mobile +sh ./mini_run.sh -mobile tests/mobile -#if [[ -s failures.txt ]] -#then -# echo "Some mobile tests failed: running '-mobile -failures'" -# sh ./mini_run.sh -mobile -failures -# if [[ -s failures.txt ]] -# then -# MOBILE_FAILED=true -# else -# echo "All mobile tests passed after running '-mobile -failures'" -# fi -#else -# echo "All mobile tests passed on first run" -#fi +if [[ -s failures.txt ]] +then + echo "Some mobile tests failed: running '-mobile -failures'" + sh ./mini_run.sh -mobile -failures + if [[ -s failures.txt ]] + then + MOBILE_FAILED=true + else + echo "All mobile tests passed after running '-mobile -failures'" + fi +else + echo "All mobile tests passed on first run" +fi -#rm -f local.properties +rm -f local.properties @@ -116,8 +116,10 @@ if [[ $MAIN_FAILED ]] then echo "Some of the 'main' tests failed, even after running '-failures'..." elif [[ $AIR_FAILED ]] +then echo "Some of the AIR tests failed, even after running '-apollo -failures'..." elif [[ $MOBILE_FAILED ]] +then echo "Some of the mobile tests failed, even after running '-mobile -failures'..." fi
