diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2015-11-05 06:11:12 -0800 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-11-05 06:11:12 -0800 |
| commit | a030cc750ce26bbfa3e7f4fed3b24de19fba4127 (patch) | |
| tree | 325a869f9b21cee01df3acbac1ee75eeb8becade | |
| parent | b6a32e909b1f58f157c19276af233e44627093f4 (diff) | |
| parent | f0411ec9745a50d123f68a7c7468d71afae9e2c2 (diff) | |
Merge pull request #943 from thomasvl/conformance
Update the Mac build script to include the conformance tests
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -104,4 +104,5 @@ conformance/conformance-cpp conformance/conformance-test-runner conformance/conformance.pb.cc conformance/conformance.pb.h +conformance/conformance.rb conformance/protoc_middleman diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index c38fce7c..ba13cf2b 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -114,7 +114,7 @@ while [[ $# != 0 ]]; do done # Into the proto dir. -pushd "${ProtoRootDir}" +cd "${ProtoRootDir}" # if no Makefile, force the autogen. if [[ ! -f Makefile ]] ; then @@ -160,6 +160,10 @@ header "Building" # at random. wrapped_make -j "${NUM_MAKE_JOBS}" all wrapped_make -j "${NUM_MAKE_JOBS}" check +# Fire off the conformance tests also. +cd conformance +wrapped_make -j "${NUM_MAKE_JOBS}" +cd .. header "Ensuring the ObjC descriptors are current." # Find the newest input file (protos, compiler, and the generator script). |