Merge github.com:grpc/grpc into windows-fixes

Conflicts:
	BUILD
	src/core/iomgr/tcp_server.h
	src/core/iomgr/tcp_server_posix.c
	src/core/iomgr/tcp_server_windows.c
	src/core/security/server_secure_chttp2.c
	src/core/surface/completion_queue.c
	src/core/surface/completion_queue.h
	src/core/surface/server.c
	test/core/end2end/tests/cancel_after_invoke.c
	test/core/end2end/tests/cancel_test_helpers.h
	tools/run_tests/tests.json
	vsprojects/vs2013/Grpc.mak

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh
index 7a12440db2..45f08df38f 100755
--- a/tools/buildgen/generate_projects.sh
+++ b/tools/buildgen/generate_projects.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
@@ -31,7 +31,7 @@
 
 set -e
 
-if [ "x$TEST" == "x" ] ; then
+if [ "x$TEST" = "x" ] ; then
   TEST=false
 fi
 
@@ -61,12 +61,12 @@ for dir in . ; do
     out=${out%.*}  # strip template extension
     json_files="build.json $end2end_test_build"
     data=`for i in $json_files; do echo -n "-d $i "; done`
-    if [ $TEST == true ] ; then
+    if [ "x$TEST" = "xtrue" ] ; then
       actual_out=$out
       out=`mktemp /tmp/gentXXXXXX`
     fi
     $mako_renderer $plugins $data -o $out $file
-    if [ $TEST == true ] ; then
+    if [ "x$TEST" = "xtrue" ] ; then
       diff -q $out $actual_out
       rm $out
     fi