diff options
author | Nathaniel Manista <nathaniel@google.com> | 2016-12-16 21:21:14 +0000 |
---|---|---|
committer | Nathaniel Manista <nathaniel@google.com> | 2016-12-16 23:48:52 +0000 |
commit | 8f7b0b48bf75b652653cb0391fff06c5160e46fa (patch) | |
tree | 3d57d49ad90086e0b5e29c72e6a47e956fffc4ea /tools/buildgen | |
parent | b229094678502e2606164a3240dbc8375ad403b5 (diff) | |
parent | 3fa20cffc6d7f46a6df262a0c8e155619bb7ed39 (diff) |
v1.0.x → master upmerge
Manual changes:
- Fixed use of Exception.message in _invalid_metadata_test.py
- Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb
- Added "set -e" to generate_build_additions.sh
Diffstat (limited to 'tools/buildgen')
-rw-r--r-- | tools/buildgen/generate_build_additions.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh index 53c30c7609..a4373ed350 100644 --- a/tools/buildgen/generate_build_additions.sh +++ b/tools/buildgen/generate_build_additions.sh @@ -28,6 +28,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +set -e + gen_build_yaml_dirs=" \ src/boringssl \ src/benchmark \ |