organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #943 from thomasvl/conformance

Browse source 
Update the Mac build script to include the conformance tests
This commit is contained in:
Paul Yang 2015-11-05 06:11:12 -08:00
commit a030cc750c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -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

6
objectivec/DevTools/full_mac_build.sh
View file

@ -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).