From f06330e720b0867817679fbf67aa8705ce13bbcf Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 7 May 2019 23:05:53 +0100
Subject: [PATCH] Move Scilab Travis testing from trusty to xenial

---
 .travis.yml                   | 2 +-
 Tools/travis-linux-install.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fc7714992..bede4a0d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -285,7 +285,7 @@ matrix:
       os: linux
       env: SWIGLANG=scilab
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=tcl
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index 8795229bb..d7d31505f 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -114,6 +114,10 @@ case "$SWIGLANG" in
 		fi
 		;;
 	"scilab")
+		# Travis has the wrong version of Java pre-installed resulting in error using scilab:
+		# /usr/bin/scilab-bin: error while loading shared libraries: libjava.so: cannot open shared object file: No such file or directory
+		echo "JAVA_HOME was set to $JAVA_HOME"
+		unset JAVA_HOME
 		travis_retry sudo apt-get -qq install scilab
 		;;
 	"tcl")