From a345c91a0eb9fe5cee0b31c00fdb81c28504c766 Mon Sep 17 00:00:00 2001
From: Jeff Allen <ja.py@farowl.co.uk>
Date: Fri, 2 Aug 2019 07:19:27 +0100
Subject: [PATCH] Choose Travis CI distributions to match JDKs

Unfortunately complex matrix of Linux distribution and available JDKs.
Installs ant for OSX and Linux xenial.

--HG--
extra : amend_source : 4d9134212577a42f486ca39a915130936c55fe4c
---
 .travis.yml | 39 ++++++++++++++++++++++++---------------
 build.xml   |  9 +++++----
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a930697a2..41d46d730 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,39 @@
 language: java
 
 addons:
-  homebrew:
+  hostname: jyshort
+
+  homebrew: # only active on osx
     update: true
-    packages: ant
+    packages:
+      - ant
+
 
 matrix:
   include:
-    - jdk: openjdk7
-    # - jdk: openjdk8
-    - jdk: oraclejdk8
-    # - jdk: oraclejdk9
-    # - jdk: oraclejdk11  # times out
+    - os: linux
+      dist: precise
+      jdk: oraclejdk7
+
+    - os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - ant
+      jdk: openjdk11
+
     - os: osx
-      name: "JDK: oraclejdk10 Java on macOS"
-      install: export JAVA_HOME=$(/usr/libexec/java_home)
+      osx_image: xcode9.3 # Last supporting Java 8
+      jdk: oraclejdk8
 
-addons:
-  hostname: jyshort
 
-before_install:
-  - cat /etc/hosts # optionally check the content *after*
+install:
+  - ant developer-build
 
-install: ant
 
-script: ant && ant regrtest-travis
+script:
+  - ant regrtest-travis
 
 notifications:
   email:
diff --git a/build.xml b/build.xml
index 84f194ba6..a334dd47f 100644
--- a/build.xml
+++ b/build.xml
@@ -1106,13 +1106,14 @@ The readme text for the next release will be like:
             <arg value="-w"/> <!-- re-run failed tests in verbose mode -->
             <!-- Only run the tests that are expected to work on Jython -->
             <arg value="--expected"/>
-            <arg value="-j"/>
-            <arg value="${junit.reports}"/>
             <arg value="--use"/>
             <arg value="network,subprocess"/>
             <!-- Exclude particular tests troublesome on the build bots -->
             <arg value="--exclude"/>
+            <arg value="test_gc"/> <!-- intermittently fails/hangs (xenial) -->
+            <arg value="test_mailbox"/>
             <arg value="test_select_new"/>
+            <arg value="test_smtpnet"/>
             <arg value="test_socket"/>
         </exec>
     </target>
@@ -1124,13 +1125,13 @@ The readme text for the next release will be like:
             <arg value="-w"/> <!-- re-run failed tests in verbose mode -->
             <!-- Only run the tests that are expected to work on Jython -->
             <arg value="--expected"/>
-            <arg value="-j"/>
-            <arg value="${junit.reports}"/>
             <arg value="--use"/>
             <arg value="network,subprocess"/>
             <!-- Exclude particular tests troublesome on the build bots -->
             <arg value="--exclude"/>
+            <arg value="test_mailbox"/>
             <arg value="test_select_new"/>
+            <arg value="test_smtpnet"/>
             <arg value="test_socket"/>
         </exec>
     </target>