diff options
Diffstat (limited to 'objectivec/DevTools/full_mac_build.sh')
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 71d3fa45..709aae0a 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -38,6 +38,8 @@ OPTIONS: Skip the invoke of Xcode to test the runtime on iOS. --skip-xcode-osx Skip the invoke of Xcode to test the runtime on OS X. + --skip-objc-conformance + Skip the Objective C conformance tests (run on OS X). EOF } @@ -73,6 +75,7 @@ REGEN_CPP_DESCRIPTORS=no CORE_ONLY=no DO_XCODE_IOS_TESTS=yes DO_XCODE_OSX_TESTS=yes +DO_OBJC_CONFORMANCE_TESTS=yes while [[ $# != 0 ]]; do case "${1}" in -h | --help ) @@ -105,6 +108,9 @@ while [[ $# != 0 ]]; do --skip-xcode-osx ) DO_XCODE_OSX_TESTS=no ;; + --skip-objc-conformance ) + DO_OBJC_CONFORMANCE_TESTS=no + ;; -*) echo "ERROR: Unknown option: ${1}" 1>&2 printUsage @@ -130,7 +136,9 @@ fi if [[ "${DO_AUTOGEN}" == "yes" ]] ; then header "Running autogen & configure" ./autogen.sh - ./configure CXXFLAGS="-mmacosx-version-min=10.9 -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-const-variable -Wunused-function" + ./configure \ + CPPFLAGS="-mmacosx-version-min=10.9 -Wunused-const-variable -Wunused-function" \ + CXXFLAGS="-Wnon-virtual-dtor -Woverloaded-virtual" fi if [[ "${DO_CLEAN}" == "yes" ]] ; then @@ -172,7 +180,7 @@ else wrapped_make -j "${NUM_MAKE_JOBS}" check # Fire off the conformance tests also. cd conformance - wrapped_make -j "${NUM_MAKE_JOBS}" + wrapped_make -j "${NUM_MAKE_JOBS}" test_cpp cd .. fi @@ -223,13 +231,8 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then IOS_SIMULATOR_NAME="Simulator" case "${XCODE_VERSION}" in 6.* ) - XCODEBUILD_TEST_BASE_IOS+=( - -destination "platform=iOS Simulator,name=iPhone 4s,OS=7.1" # 32bit - -destination "platform=iOS Simulator,name=iPhone 6,OS=8.4" # 64bit - -destination "platform=iOS Simulator,name=iPad 2,OS=7.1" # 32bit - -destination "platform=iOS Simulator,name=iPad Air,OS=8.4" # 64bit - ) - IOS_SIMULATOR_NAME="iOS Simulator" + echo "ERROR: Xcode 6.3/6.4 no longer supported for building, please use 7.0 or higher." 1>&2 + exit 10 ;; 7.* ) XCODEBUILD_TEST_BASE_IOS+=( @@ -264,3 +267,9 @@ if [[ "${DO_XCODE_OSX_TESTS}" == "yes" ]] ; then header "Doing Xcode OS X build/tests - Release" "${XCODEBUILD_TEST_BASE_OSX[@]}" -configuration Release test fi + +if [[ "${DO_OBJC_CONFORMANCE_TESTS}" == "yes" ]] ; then + cd conformance + wrapped_make -j "${NUM_MAKE_JOBS}" test_objc + cd .. +fi |