From 68745703f8484d6ae78e6c49fd59103422185d76 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Sun, 29 Mar 2020 19:43:34 -0400
Subject: [PATCH] fix testing test, remove trusty

---
 .travis.yml                        | 4 ----
 src/travis/linux-before-install.sh | 4 ++--
 src/travis/linux-install.sh        | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cdeb3a6f..dc2608d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,10 +59,6 @@ jobs:
       name: "Linux ARM64 Xenial"
       language: shell
       filter_secrets: false
-    - os: linux
-      name: "Linux 64-bit Trusty"
-      dist: trusty
-      language: shell
     - os: linux
       name: "Python 3.6 Source Testing"
       dist: bionic
diff --git a/src/travis/linux-before-install.sh b/src/travis/linux-before-install.sh
index d6257a38..d0667385 100755
--- a/src/travis/linux-before-install.sh
+++ b/src/travis/linux-before-install.sh
@@ -1,4 +1,4 @@
-if [ "$TRAVIS_JOB_NAME" == *"Testing" ]; then
+if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then
   export python="python"
   export pip="pip"
   echo "Travis setup Python $TRAVIS_PYTHON_VERSION"
@@ -91,7 +91,7 @@ else
   python=~/python/bin/python3
   pip=~/python/bin/pip3
 
-  if [ "${dist}" == "trusty" ]; then
+  if ([ "${dist}" == "trusty" ] || [ "${dist}" == "xenial" ]); then
     echo "Installing deps for StaticX..."
     if [ ! -d patchelf-$PATCHELF_VERSION ]; then
       echo "Downloading PatchELF $PATCHELF_VERSION"
diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh
index 4ee6b874..e352ff58 100755
--- a/src/travis/linux-install.sh
+++ b/src/travis/linux-install.sh
@@ -1,5 +1,5 @@
 cd src
-if [ "$VMTYPE" == "test" ]; then
+if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then
   export gam="$python gam.py"
   export gampath=$(readlink -e .)
 else
@@ -18,8 +18,8 @@ else
   du -h gam/gam
   time $gam version extended
 
-  if [ "${dist}" == "trusty" ]; then
-    GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz
+  if ([ "${dist}" == "trusty" ] || [ "$(dist)" == "xenial" ]); then
+    GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-${dist}legacy.tar.xz
     $python -OO -m staticx gam/gam gam/gam-staticx
     strip gam/gam-staticx
     rm gam/gam