aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-11-08 23:16:42 -0800
committerSteven Fackler <[email protected]>2015-11-08 23:16:42 -0800
commit776852ff2bfe01ea22abe7f2ca5d086e713c6fd1 (patch)
tree6f6f61da6d002b20d0b9b100266cf14ce0d0c8a7
parentBetter debug impls (diff)
downloadrust-openssl-776852ff2bfe01ea22abe7f2ca5d086e713c6fd1.tar.xz
rust-openssl-776852ff2bfe01ea22abe7f2ca5d086e713c6fd1.zip
Travis without sudo
-rw-r--r--.travis.yml5
-rwxr-xr-xopenssl/test/build.sh5
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 8ee8c929..51a471c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: rust
+sudo: false
rust:
- nightly
- beta
@@ -13,5 +14,5 @@ before_install:
- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)
script:
- (test $TRAVIS_OS_NAME != "osx" || (cd openssl && cargo test))
-- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test))
-- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES"))
+- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=$HOME/openssl/lib OPENSSL_INCLUDE_DIR=$HOME/openssl/include LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH cargo test))
+- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=$HOME/openssl/lib OPENSSL_INCLUDE_DIR=$HOME/openssl/include LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES"))
diff --git a/openssl/test/build.sh b/openssl/test/build.sh
index db517ab3..1b923cb1 100755
--- a/openssl/test/build.sh
+++ b/openssl/test/build.sh
@@ -3,8 +3,7 @@ set -e
mkdir /tmp/openssl
cd /tmp/openssl
-sudo apt-get install gcc make
curl https://openssl.org/source/openssl-1.0.2d.tar.gz | tar --strip-components=1 -xzf -
-./config --prefix=/usr/ shared
+./config --prefix=$HOME/openssl shared
make
-sudo make install
+make install