Author: vrockai Date: 2009-02-20 08:51:20 -0500 (Fri, 20 Feb 2009) New Revision: 12848 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh Log: run.sh build-local fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-20 13:14:33 UTC (rev 12847) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-20 13:51:20 UTC (rev 12848) @@ -2,13 +2,13 @@ export HELPMODE=0 -if [ ! -n "${1+x}" ]; then - export HELPMODE=1 -elif [ $1 = "help" ]; then - export HELPMODE=1 -fi +#if [ ! -n "${1+x}" ]; then + #export HELPMODE=1 +#elif [ $1 = "help" ]; then + #export HELPMODE=1 +#fi -if [ $HELPMODE -eq 1 ]; then +if [ -z "$1" -o "$1" = "help" ]; then echo "Usage: " echo " run.sh MODE FF_LOCATION [TESTCLASS_NAME]" echo @@ -34,32 +34,49 @@ echo " run.sh single /home/vrockai/opt/firefox3/firefox-bin org/jboss/portal/test/selenium/DashboardTestCase.class" else if [ $1 != "help" ]; then - ant clean - echo "Action: $1" - echo "Firefox bin location: $2" - echo "Testclass name: $3" + ant clean + echo "Action: $1" + echo "Firefox bin location: $2" + echo "Testclass name: $3" fi if [ $1 = "test" ]; then - ant -f build.xml copyApps - ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" + if [ -z "$2" -o ! -f "$2" ]; then + echo + echo "ERROR: Firefox location not set"; + exit 0; + fi + ant -f build.xml copyApps + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" + elif [ $1 = "end2end" ]; then + if [ -z "$2" -o ! -f "$2" ]; then + echo + echo "ERROR: Firefox location not set"; + exit 0; + fi + ant -f build.xml copyApps + ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" + elif [ $1 = "perf" ]; then + if [ -z "$2" -o ! -f "$2" ]; then + echo + echo "ERROR: Firefox location not set"; + exit 0; + fi + ant -f build.xml copyApps + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" + elif [ $1 = "selenium" ]; then + ant -f build.xml run-src + elif [ $1 = "single" ]; then + if [ -z "$2" -o ! -f "$2" ]; then + echo + echo "ERROR: Firefox location not set"; + exit 0; + fi + if [ -z "$3" ]; then + echo + echo "ERROR: Testclasss not set"; + exit 0; + fi + ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" fi - - if [ $1 = "end2end" ]; then - ant -f build.xml copyApps - ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" - fi - - if [ $1 = "perf" ]; then - ant -f build-local.xml copyApps - ant -f build-local.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" - fi - - if [ $1 = "selenium" ]; then - ant -f build-local.xml run-src - fi - - if [ $1 = "single" ]; then - ant -f build-local.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" - fi fi