From 842040a8b37bb36e0903ee85bbabd9a98c3c32f7 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 9 Jul 2019 21:39:27 -0400
Subject: [PATCH] run e2e tests again

---
 .travis.yml                               | 1 -
 src/travis/linux-x86_64-before-install.sh | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9faf1b1..0e7d8523 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -142,7 +142,6 @@ script:
 - if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version
 - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")"
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi
-- export e2e=false # temp disable tests to complete compile
 - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi
 - if [ "$e2e" = true ]; then openssl aes-256-cbc -K $encrypted_ab10ec38326e_key -iv $encrypted_ab10ec38326e_iv -in travis/oauth2service.json.enc -out $gampath/oauth2service.json -d; fi
 - if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi
diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh
index cd94bb53..4c6d8354 100755
--- a/src/travis/linux-x86_64-before-install.sh
+++ b/src/travis/linux-x86_64-before-install.sh
@@ -10,7 +10,7 @@ else
   echo "RUNNING: apt update..."
   sudo apt-get -qq --yes update > /dev/null
   echo "RUNNING: apt dist-upgrade..."
-  #sudo apt-get -qq --yes dist-upgrade > /dev/null
+  sudo apt-get -qq --yes dist-upgrade > /dev/null
   echo "Installing build tools..."
   sudo apt-get -qq --yes install build-essential
 
@@ -36,11 +36,11 @@ else
   fi
   cd openssl-$BUILD_OPENSSL_VERSION
   echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..."
-  #./config shared --prefix=$mypath/ssl
+  ./config shared --prefix=$mypath/ssl
   echo "Running make for OpenSSL..."
-  #make -j$cpucount -s
+  make -j$cpucount -s
   echo "Running make install for OpenSSL..."
-  #make install > /dev/null
+  make install > /dev/null
   export LD_LIBRARY_PATH=~/ssl/lib
   cd ~