Merge pull request #771 from realm/ex/fix_test_script

Make shellcheck happy about test.sh
This commit is contained in:
Emanuele Zattin 2017-01-03 13:00:30 +01:00 committed by GitHub
commit cce41ebcf1
2 changed files with 41 additions and 32 deletions

View File

@ -15,7 +15,7 @@ ios_sim_default_ios_version=${IOS_SIM_OS:-iOS 10.1}
PATH="/opt/android-sdk-linux/platform-tools:$PATH"
SRCROOT=$(cd "$(dirname "$0")/.." && pwd)
XCPRETTY=`which xcpretty || true`
XCPRETTY=$(which xcpretty || true)
CI_RUN=false
if [ -n "${JENKINS_HOME}" ]; then
CI_RUN=true
@ -47,7 +47,7 @@ start_server() {
}
stop_server() {
if [[ ${SERVER_PID} > 0 ]] ; then
if [[ ${SERVER_PID} -gt 0 ]] ; then
kill -9 ${SERVER_PID}
fi
}
@ -115,13 +115,13 @@ xctest() {
# - Run the build and test
if [ -n "$XCPRETTY" ]; then
log_temp=`mktemp build.log.XXXXXX`
log_temp=$(mktemp build.log.XXXXXX)
if [ -e "$log_temp" ]; then
rm "$log_temp"
fi
xcrun xcodebuild -scheme "$1" -configuration "$CONFIGURATION" -sdk iphonesimulator -destination name="iPhone 5s" build test 2>&1 | tee "$log_temp" | "$XCPRETTY" -c --no-utf --report junit --output build/reports/junit.xml || {
EXITCODE=$?
printf "*** Xcode Failure (exit code $EXITCODE). The full xcode log follows: ***\n\n"
printf "*** Xcode Failure (exit code %s). The full xcode log follows: ***\n\n" "$EXITCODE"
cat "$log_temp"
printf "\n\n*** End Xcode Failure ***\n"
exit $EXITCODE
@ -139,7 +139,8 @@ xctest() {
setup_ios_simulator() {
# - Ensure one version of xcode is chosen by all tools
if [[ -z "$DEVELOPER_DIR" ]]; then
export DEVELOPER_DIR="$(xcode-select -p)"
DEV_DIR="$(xcode-select -p)"
export DEVELOPER_DIR=$DEV_DIR
fi
# -- Ensure that the simulator is ready
@ -167,14 +168,15 @@ setup_ios_simulator() {
# - Prod `simctl` a few times as sometimes it fails the first couple of times after switching XCode vesions
local deadline=$((SECONDS+5))
while [ -z "`xcrun simctl list devices 2>/dev/null`" ] && [ $SECONDS -lt $deadline ]; do
while [ -z "$(xcrun simctl list devices 2>/dev/null)" ] && [ $SECONDS -lt $deadline ]; do
: # nothing to see here, will stop cycling on the first successful run
done
# - Choose a device, if it has not already been chosen
local deadline=$((SECONDS+5))
while [ -z "$IOS_SIM_DEVICE" ] && [ $SECONDS -lt $deadline ]; do
export IOS_SIM_DEVICE=`ruby -rjson -e "puts JSON.parse(%x{xcrun simctl list devices --json})['devices'].each{|os,group| group.each{|dev| dev['os'] = os}}.flat_map{|x| x[1]}.select{|x| x['availability'] == '(available)'}.each{|x| x['score'] = (x['name'] == '$ios_sim_default_device_type' ? 1 : 0) + (x['os'] == '$ios_sim_default_ios_version' ? 1 : 0)}.sort_by!{|x| [x['score'], x['name']]}.reverse![0]['udid']"`
IOS_DEVICE=$(ruby -rjson -e "puts JSON.parse(%x{xcrun simctl list devices --json})['devices'].each{|os,group| group.each{|dev| dev['os'] = os}}.flat_map{|x| x[1]}.select{|x| x['availability'] == '(available)'}.each{|x| x['score'] = (x['name'] == '$ios_sim_default_device_type' ? 1 : 0) + (x['os'] == '$ios_sim_default_ios_version' ? 1 : 0)}.sort_by!{|x| [x['score'], x['name']]}.reverse![0]['udid']")
export IOS_SIM_DEVICE=$IOS_DEVICE
done
if [ -z "$IOS_SIM_DEVICE" ]; then
echo "*** Failed to determine the iOS Simulator device to use ***"
@ -199,7 +201,8 @@ setup_ios_simulator() {
# - Select the first device booted in the simulator, since it will boot something for us
local deadline=$((SECONDS+10))
while [ -z "$IOS_SIM_DEVICE" ] && [ $SECONDS -lt $deadline ]; do
export IOS_SIM_DEVICE=`ruby -rjson -e "puts JSON.parse(%x{xcrun simctl list devices --json})['devices'].each{|os,group| group.each{|dev| dev['os'] = os}}.flat_map{|x| x[1]}.select{|x| x['state'] == 'Booted'}[0]['udid']"`
IOS_DEVICE=$(ruby -rjson -e "puts JSON.parse(%x{xcrun simctl list devices --json})['devices'].each{|os,group| group.each{|dev| dev['os'] = os}}.flat_map{|x| x[1]}.select{|x| x['state'] == 'Booted'}[0]['udid']")
export IOS_SIM_DEVICE=$IOS_DEVICE
done
if [ -z "$IOS_SIM_DEVICE" ]; then
echo "*** Failed to determine the iOS Simulator device in use ***"
@ -208,8 +211,8 @@ setup_ios_simulator() {
fi
# Wait until the boot completes
printf " waiting for simulator ($IOS_SIM_DEVICE) to boot..."
until ruby -rjson -e 'exit JSON.parse(`xcrun simctl list devices -j `)["devices"].flat_map { |d| d[1] }.any? { |d| d["availability"] == "(available)" && d["state"] == "Booted" }'; do
printf " waiting for simulator (%s) to boot..." "$IOS_SIM_DEVICE"
until ruby -rjson -e "exit JSON.parse(%x{xcrun simctl list devices --json})['devices'].flat_map { |d| d[1] }.any? { |d| d['availability'] == '(available)' && d['state'] == 'Booted' }"; do
sleep 0.25
done
echo " done"
@ -222,6 +225,7 @@ trap cleanup EXIT
# Use a consistent version of Node if possible.
if [ -s "${HOME}/.nvm/nvm.sh" ]; then
# shellcheck disable=SC1090
. "${HOME}/.nvm/nvm.sh"
nvm use 5.12 || true
fi
@ -320,7 +324,7 @@ case "$TARGET" in
pushd "$SRCROOT/tests"
npm install
eval $npm_tests_cmd
eval "$npm_tests_cmd"
popd
stop_server
;;
@ -337,6 +341,11 @@ case "$TARGET" in
popd
;;
"test-runners")
# Create a fake realm module that points to the source root so that test-runner tests can require('realm')
rm -rf "$SRCROOT/tests/test-runners/node-modules/realm"
mkdir -p "$SRCROOT/tests/test-runners/node_modules"
ln -s "../../.." "$SRCROOT/tests/test-runners/node_modules/realm"
npm install --build-from-source
for runner in ava mocha jest; do
@ -348,10 +357,11 @@ case "$TARGET" in
;;
"object-store")
pushd src/object-store
cmake -DCMAKE_BUILD_TYPE=$CONFIGURATION .
cmake -DCMAKE_BUILD_TYPE="$CONFIGURATION" .
make run-tests
;;
"download-object-server")
# shellcheck disable=SC1091
. dependencies.list
object_server_bundle="realm-object-server-bundled_node_darwin-$REALM_OBJECT_SERVER_VERSION.tar.gz"

View File

@ -1 +0,0 @@
../../..