summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rwxr-xr-xscripts/travis_before_install.sh9
2 files changed, 1 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 78b2754a80..7f5c733770 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ before_install:
- source ./scripts/travis_helper.sh
- source ./scripts/flags.sh
- ./scripts/travis_before_install.sh
+- glxinfo
install:
- make setup
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index a02019e827..f673026064 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -27,14 +27,6 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
- ls -la /usr/lib | grep llvm
- ls -la /usr/bin | grep llvm
-
- ls -la /usr/local
-
- llvm-config --libdir
- llvm-config-3.4 --libdir
-
mapbox_time "build_mesa" \
git clone git://anongit.freedesktop.org/git/mesa/mesa && \
cd mesa && \
@@ -42,7 +34,6 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
--enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
make && sudo make install && \
export LD_LIBRARY_PATH=/usr/local/lib && \
- glxinfo && \
cd ../
mapbox_time "install_opengl" \