From b4dec6b897dcce0116e6afb09ef17ca8b7fcb3d7 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sat, 22 Dec 2018 15:11:08 -0800
Subject: [PATCH 1/2] Fixed amalgamation to not list header files explicitly.

---
 build_defs.bzl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build_defs.bzl b/build_defs.bzl
index 825101433e..7445fce136 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -182,13 +182,14 @@ _file_list_aspect = aspect(
 )
 
 def _upb_amalgamation(ctx):
+    inputs = []
     srcs = []
-    hdrs = []
     for lib in ctx.attr.libs:
-        srcs += lib[SrcList].srcs
-        hdrs += lib[SrcList].hdrs
+        inputs += lib[SrcList].srcs
+        inputs += lib[SrcList].hdrs
+        srcs += [src for src in lib[SrcList].srcs if src.path.endswith("c")]
     ctx.actions.run(
-        inputs = srcs + hdrs,
+        inputs = inputs,
         outputs = ctx.outputs.outs,
         arguments = ["", ctx.bin_dir.path + "/"] + [f.path for f in srcs],
         progress_message = "Making amalgamation",

From 51a646ec11c0ba6a0cc1aa75e2474e5a9c282e47 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sat, 22 Dec 2018 15:30:31 -0800
Subject: [PATCH 2/2] Make Bazel print output for failed tests.

---
 kokoro/ubuntu/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh
index 70a81592a5..3550a34ed4 100644
--- a/kokoro/ubuntu/build.sh
+++ b/kokoro/ubuntu/build.sh
@@ -8,4 +8,4 @@ which bazel
 bazel version
 
 cd $(dirname $0)/../..
-bazel test :all
+bazel test --test_output=errors :all