diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2015-11-17 10:18:49 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-11-18 11:58:19 -0500 |
| commit | 1745f7eae9bc206ffeb47d63dcdfa039ef3774e8 (patch) | |
| tree | 94c3b61e4b025c453c949c45255c5681914c799b /objectivec/DevTools | |
| parent | 8162451b727e5abd46ea934a81d44c6ff7e0963e (diff) | |
Add support for the conformance test for objc when run on OS X
Diffstat (limited to 'objectivec/DevTools')
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 71d3fa45..251f2599 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 @@ -172,7 +178,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 @@ -264,3 +270,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 |