Skip to content

Commit

Permalink
Made test.sh sh compatible (removed bashisms). Made test.sh not rely …
Browse files Browse the repository at this point in the history
…on mac-only tooling. Small documentation tweaks in readme and contributing doc.
  • Loading branch information
filmaj committed Oct 24, 2013
1 parent bd8cbab commit 4969bba
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ Now you are ready to run the Appium server via `node .`.
Since Appium uses dev versions of some packages, it often becomes necessary to
install new `npm` packages or update various things. There's a handy shell script
to do all this for all platforms (the `--dev` flag gets dev npm dependencies
and test applications used in the Appium test suite):
and test applications used in the Appium test suite). You will also need to do
this when Appium bumps its version up:

./reset.sh --dev

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ Gecko-based platforms.

## Contributing

Please take a look at our [contribution documentation](https://github.com/appium/appium/blob/master/CONTRIBUTING.md).
Please take a look at our [contribution documentation](https://github.com/appium/appium/blob/master/CONTRIBUTING.md)
for instructions on how to build, test and run Appium from source.

## Project Credits & Inspiration

Expand Down
15 changes: 9 additions & 6 deletions bin/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ ios_only=false
ios7_only=false
android_only=false
all_tests=true
xcode_path="$(xcode-select -print-path | sed s/\\/Contents\\/Developer//g)"
xcode_path=""
if command -v xcode-select 2>/dev/null; then
xcode_path="$(xcode-select -print-path | sed s/\\/Contents\\/Developer//g)"
fi
did_switch_xcode=false

function join_testfiles {
join_testfiles () {
testtype=$1
shift
outfile=$1
Expand All @@ -32,16 +35,16 @@ function join_testfiles {
}

for arg in "$@"; do
if [[ "$arg" = "--ios" ]]; then
if [ "$arg" = "--ios" ]; then
ios_only=true
all_tests=false
elif [[ "$arg" = "--android" ]]; then
elif [ "$arg" = "--android" ]; then
android_only=true
all_tests=false
elif [[ "$arg" = "--ios7" ]]; then
elif [ "$arg" = "--ios7" ]; then
ios7_only=true
all_tests=false
elif [[ "$arg" =~ " " ]]; then
elif [ "$arg" =~ " " ]; then
mocha_args="$mocha_args \"$arg\""
else
mocha_args="$mocha_args $arg"
Expand Down

0 comments on commit 4969bba

Please sign in to comment.