From e3e38b81cc2eb3b31896342a2511cdc390bed280 Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Thu, 8 Dec 2016 14:39:20 -0800
Subject: Update commit id in Dockerfile to trigger update. (#2467)

---
 tests.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'tests.sh')

diff --git a/tests.sh b/tests.sh
index 5a5fdf83..348a8493 100755
--- a/tests.sh
+++ b/tests.sh
@@ -327,6 +327,8 @@ build_jruby() {
 build_ruby_all() {
   build_ruby21
   build_ruby22
+  # TODO(teboring): Disable jruby test temperarily for it randomly fails.
+  # https://grpc-testing.appspot.com/job/protobuf_pull_request/735/consoleFull.
   build_jruby
 }
 
@@ -386,10 +388,11 @@ use_php_bc() {
 
 build_php5.5() {
   use_php 5.5
-  cd php
+  pushd php
   rm -rf vendor
   cp -r /usr/local/vendor-5.5 vendor
   ./vendor/bin/phpunit
+  popd
 }
 
 build_php5.5_c() {
@@ -405,10 +408,11 @@ build_php5.5_zts_c() {
 
 build_php5.5_32() {
   use_php_bc 5.5
-  cd php
+  pushd php
   rm -rf vendor
   cp -r /usr/local/vendor-5.5 vendor
   ./vendor/bin/phpunit
+  popd
 }
 
 build_php5.5_c_32() {
@@ -419,10 +423,11 @@ build_php5.5_c_32() {
 
 build_php5.6() {
   use_php 5.6
-  cd php
+  pushd php
   rm -rf vendor
   cp -r /usr/local/vendor-5.6 vendor
   ./vendor/bin/phpunit
+  popd
 }
 
 build_php5.6_c() {
@@ -453,10 +458,11 @@ build_php5.6_mac() {
 
 build_php7.0() {
   use_php 7.0
-  cd php
+  pushd php
   rm -rf vendor
   cp -r /usr/local/vendor-7.0 vendor
   ./vendor/bin/phpunit
+  popd
 }
 
 build_php7.0_c() {
-- 
cgit v1.2.3