ref: 3940beb7e83e0436f889379d9b156234ad5132c0
parent: 2966abd937478cf60e7d0a82185f2a80cda586de
parent: 3fdda8782a1f8f907da10835b9a1a1b7c15b91e3
author: Ethan Hugg <[email protected]>
date: Mon Feb 24 02:45:44 EST 2014
Merge pull request #351 from mstorsjo/simplify-travis Simplify the travis configuration now that OpenSSL isn't required any longer
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@
- clang
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev libssl1.0.0:i386
-#link libcrypto for 32bit
- - sudo ln -s /lib/i386-linux-gnu/libcrypto.so.1.0.0 /lib/i386-linux-gnu/libcrypto.so
+ - sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev
install: make gtest-bootstrap
script: make -B ENABLE64BIT=Yes && make test && make -B ENABLE64BIT=Yes BUILDTYPE=Debug && make test && make -B ENABLE64BIT=No && make test && make -B ENABLE64BIT=No BUILDTYPE=Debug && make test