aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xobjectivec/DevTools/full_mac_build.sh6
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 46487128..a9b0a885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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).