Merge remote-tracking branch 'google/master' into tweaks

Conflicts:
	tools/run_tests/run_tests.py

3 files changed, 31 insertions, 14 deletions

diff --git a/tools/dockerfile/grpc_java/Dockerfile b/tools/dockerfile/grpc_java/Dockerfile
index f7156c7f38..78659dedeb 100644
--- a/tools/dockerfile/grpc_java/Dockerfile
+++ b/tools/dockerfile/grpc_java/Dockerfile
@@ -13,4 +13,4 @@ RUN cd /var/local/git/grpc-java && \
   mvn install
 
 # Specify the default command such that the interop server runs on its known testing port
-CMD ["/var/local/git/grpc-java/run-test-server.sh", "--transport=NETTY_TLS", "--grpc_version=2", "--port=8030"]
+CMD ["/var/local/git/grpc-java/run-test-server.sh", "--transport=HTTP2_NETTY_TLS", "--grpc_version=2", "--port=8030"]
diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile
index fe8edeb698..44fa52c0e8 100644
--- a/tools/dockerfile/grpc_java_base/Dockerfile
+++ b/tools/dockerfile/grpc_java_base/Dockerfile
@@ -1,13 +1,21 @@
 # Base Dockerfile for the gRPC Java dev image
 FROM grpc/base
 
-RUN apt-get update && apt-get -y install java7-jdk
+# Install JDK 8
+#
+# TODO(temiola): simplify this if/when a simpler process is available.
+#
+RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list
+RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
+RUN apt-get update && apt-get -y install oracle-java8-installer
 
 # Install maven
 RUN wget http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-3.2.1-bin.tar.gz && \
   tar xvf apache-maven-3.2.1-bin.tar.gz -C /var/local
 
-ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 ENV M2_HOME /var/local/apache-maven-3.2.1
 ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin
 ENV LD_LIBRARY_PATH /usr/local/lib
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 0e627d8f96..460a945cee 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -15,6 +15,7 @@ import watch_dirs
 class SimpleConfig(object):
   def __init__(self, config):
     self.build_config = config
+    self.maxjobs = 32 * multiprocessing.cpu_count()
 
   def run_command(self, binary):
     return [binary]
@@ -22,11 +23,13 @@ class SimpleConfig(object):
 
 # ValgrindConfig: compile with some CONFIG=config, but use valgrind to run
 class ValgrindConfig(object):
-  def __init__(self, config):
+  def __init__(self, config, tool):
     self.build_config = config
+    self.tool = tool
+    self.maxjobs = 4 * multiprocessing.cpu_count()
 
   def run_command(self, binary):
-    return ['valgrind', binary]
+    return ['valgrind', binary, '--tool=%s' % self.tool]
 
 
 # different configurations we can run under
@@ -37,7 +40,8 @@ _CONFIGS = {
   'msan': SimpleConfig('msan'),
   'asan': SimpleConfig('asan'),
   'gcov': SimpleConfig('gcov'),
-  'valgrind': ValgrindConfig('dbg'),
+  'memcheck': ValgrindConfig('dbg', 'memcheck'),
+  'helgrind': ValgrindConfig('dbg', 'helgrind')
   }
 
 
@@ -85,14 +89,19 @@ def _build_and_run(check_cancelled, newline_on_success, forever=False):
     return 1
 
   # run all the tests
-  if not jobset.run((
-      config.run_command(x)
-      for config in run_configs
-      for filt in filters
-      for x in itertools.chain.from_iterable(itertools.repeat(
-          glob.glob('bins/%s/%s_test' % (
-              config.build_config, filt)),
-          runs_per_test))), check_cancelled, newline_on_success=newline_on_success):
+  if not jobset.run(
+      itertools.ifilter(
+          lambda x: x is not None, (
+              config.run_command(x)
+              for config in run_configs
+              for filt in filters
+              for x in itertools.chain.from_iterable(itertools.repeat(
+                  glob.glob('bins/%s/%s_test' % (
+                      config.build_config, filt)),
+                  runs_per_test)))),
+              check_cancelled,
+              newline_on_success=newline_on_success,
+              maxjobs=min(c.maxjobs for c in run_configs)):
     if not forever:
       jobset.message('FAILED', 'Some tests failed', do_newline=True)
     return 2