@@ -25,6 +25,9 @@ OUTPUT_DIR=/tmp/xcodetest/${MAIN_APP_TARGET}
2525XCODE_TEST_PATH=${OUTPUT_DIR} /${UNIT_TEST_TARGET} .octest/${UNIT_TEST_TARGET}
2626XCODE_TEST_LDFLAGS=" -all_load -ObjC -framework SenTestingKit${LINK_TO_XCODE_TEST_LIB} -F\" $\(SDKROOT\)/Developer/Library/Frameworks\" "
2727
28+ # More reliable if the simulator is not already running
29+ osascript -e' tell app "iPhone Simulator" to quit'
30+
2831# Build the unit tests bundle, so it can be fed into waxsim
2932xcodebuild -sdk iphonesimulator -scheme${UNIT_TEST_TARGET} build CONFIGURATION_BUILD_DIR=" ${OUTPUT_DIR} "
3033if [[$? != 0 ]]; then
4346which waxsim
4447if [[$? != 0 ]]; then
4548echo " Could not find 'waxsim', make sure it is installed and try again"
46- exit 1
49+ exit $?
4750fi
4851
52+ # Warn users that it wont run the tests unless you tweak the linker settings
53+ echo " ================="
54+ echo " If tests do not run, make sure you have included XCODE_TEST_LDFLAGS in your linker flags:"
55+ echo " In xcconfigs: OTHER_LDFLAGS =\$ (inherited)\$ (XCODE_TEST_LDFLAGS)"
56+ echo " In Xcode: set Other Linker Flags to include\$ (XCODE_TEST_LDFLAGS)"
57+ echo " ================="
58+
4959# Run the app in the simulator, will automatically load and run unit tests
5060OUT_FILE=${OUTPUT_DIR} /waxsim.out
51- waxsim${OUTPUT_DIR} /${MAIN_APP_TARGET} .app -SenTest All -e XCODE_TEST_PATH=${XCODE_TEST_PATH} > ${OUT_FILE} 2>&1
61+ XCODE_TEST_PATH=${XCODE_TEST_PATH} waxsim${OUTPUT_DIR} /${MAIN_APP_TARGET} .app -SenTest All> ${OUT_FILE} 2>&1
62+ cat${OUT_FILE}
63+ osascript -e' tell app "iPhone Simulator" to quit'
5264
5365# if there was a failure, show what waxsim was hiding and crucially return with a non-zero exit code
5466grep -q" : error:" $OUT_FILE
5567success=` exec grep -c" : error:" $OUT_FILE `
5668
5769if [[$success != 0 ]]; then
58- cat$OUT_FILE
59- echo " ==========================================="
60- echo " GUI Tests failed"
61- echo " ==========================================="
70+ echo " ================="
71+ echo " Unit Tests Failed"
72+ echo " ================="
6273exit 1
6374else
64- grep -v" started" $OUT_FILE | grep" Test Case"
65- echo " ==========================================="
66- echo " GUI Tests passed"
67- echo " ==========================================="
75+ echo " ================="
76+ echo " Unit Tests Passed"
77+ echo " ================="
6878fi
