Merge pull request #5787 from BSBandme/3.7.x-fix

Cherry-pick fixing for mac tests after kokoro updates 

4 files changed, 13 insertions, 6 deletions

diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 6f63a4cc2..126928938 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -90,8 +90,8 @@ $(benchmarks_protoc_outputs_proto2_header): protoc_middleman2
 
 initialize_submodule:
 	oldpwd=`pwd`
-	cd $(top_srcdir) && git submodule update --init -r third_party/benchmark
-	cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make
+	cd $(top_srcdir) && git submodule update --init -r third_party/benchmark && \
+		cd third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make
 	cd $$oldpwd
 	touch initialize_submodule
 
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
index c5687e9d8..7bbc12da4 100755
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@@ -5,7 +5,10 @@
 ##
 # Select Xcode version
 
-export DEVELOPER_DIR=/Applications/Xcode_9.1.app/Contents/Developer
+# Remember to udpate the Xcode version when xcode_9.4.1 is not available.
+# If xcode is not available, it will probaly encounter the failure for 
+# "autom4te: need GNU m4 1.4 or later: /usr/bin/m4""
+export DEVELOPER_DIR=/Applications/Xcode_9.4.1.app/Contents/Developer
 
 ##
 # Select C/C++ compilers
@@ -18,8 +21,11 @@ export CXX=g++
 
 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 source $HOME/.rvm/scripts/rvm
-brew uninstall node icu4c
-brew install gflags gpg gpg2 node pcre ruby
+brew uninstall node icu4c cmake
+brew prune
+brew install gflags gpg gpg2 node pcre ruby cmake
+sudo chown -R $(whoami) /usr/local
+brew postinstall node
 
 ##
 # Install Tox
diff --git a/python/setup.py b/python/setup.py
index 5f052673e..ba74443b3 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -188,6 +188,7 @@ if __name__ == '__main__':
 
     if sys.platform == 'darwin':
       extra_compile_args.append("-Wno-shorten-64-to-32");
+      extra_compile_args.append("-Wno-deprecated-register");
 
     # https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
     # C++ projects must now migrate to libc++ and are recommended to set a
diff --git a/tests.sh b/tests.sh
index 618b6864f..51d9c7072 100755
--- a/tests.sh
+++ b/tests.sh
@@ -226,7 +226,7 @@ build_objectivec_tvos_release() {
 
 build_objectivec_cocoapods_integration() {
   # Update pod to the latest version.
-  gem install cocoapods --no-ri --no-rdoc
+  gem install cocoapods --no_document
   objectivec/Tests/CocoaPods/run_tests.sh
 }