deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

run e2e tests again

Browse Source
This commit is contained in:
Jay Lee
2019-07-09 21:39:27 -04:00
parent 1205da5d34
commit 842040a8b3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -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 - 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")" - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")"
- if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi - 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 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 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 - if [ "$e2e" = true ]; then cat travis/cfg_template.json | python travis/svars-write.py &> /dev/null; fi

8
src/travis/linux-x86_64-before-install.sh
View File

@@ -10,7 +10,7 @@ else
echo "RUNNING: apt update..." echo "RUNNING: apt update..."
sudo apt-get -qq --yes update > /dev/null sudo apt-get -qq --yes update > /dev/null
echo "RUNNING: apt dist-upgrade..." 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..." echo "Installing build tools..."
sudo apt-get -qq --yes install build-essential sudo apt-get -qq --yes install build-essential
@@ -36,11 +36,11 @@ else
fi fi
cd openssl-$BUILD_OPENSSL_VERSION cd openssl-$BUILD_OPENSSL_VERSION
echo "Compiling 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..." echo "Running make for OpenSSL..."
#make -j$cpucount -s make -j$cpucount -s
echo "Running make install for OpenSSL..." echo "Running make install for OpenSSL..."
#make install > /dev/null make install > /dev/null
export LD_LIBRARY_PATH=~/ssl/lib export LD_LIBRARY_PATH=~/ssl/lib
cd ~ cd ~