Skip to content

Commit d9afbfc

Browse files
committed
travis dragonegg target required some tlc.
1 parent 168e9c0 commit d9afbfc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ python:
88
install:
99
- sudo apt-get update
1010
- sudo apt-get install -y python-pip
11-
- sudo apt-get install llvm-3.4 clang-3.4 libapr1-dev libaprutil1-dev
12-
- sudo apt-get install dragonegg llvm-3.0 llvm-gcc
11+
- sudo apt-get install llvm-3.5 clang-3.5 libapr1-dev libaprutil1-dev
12+
- sudo apt-get install dragonegg llvm-3.5 llvm-gcc-4.7
1313
- sudo pip install -e .
1414
- export WLLVM_HOME=`pwd`
15+
- export APACHE_VER=2.4.18
16+
1517

1618
# command to run tests
1719
script:

.travis/apache_clang.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
set -e
44

55

6-
export PATH=/usr/lib/llvm-3.4/bin:${PATH}
6+
export PATH=/usr/lib/llvm-3.5/bin:${PATH}
77
export LLVM_COMPILER=clang
88
export WLLVM_OUTPUT=WARNING
99

10-
APACHE_VER=2.4.18
1110
wget https://archive.apache.org/dist/httpd/httpd-${APACHE_VER}.tar.gz
1211

1312
tar xfz httpd-${APACHE_VER}.tar.gz

.travis/apache_dragonegg.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ set -e
44

55
export dragonegg_disable_version_check=true
66

7-
export PATH=/usr/lib/llvm-3.0/bin:${PATH}
7+
export PATH=/usr/lib/llvm-3.5/bin:${PATH}
88
export LLVM_COMPILER=dragonegg
99
export LLVM_GCC_PREFIX=llvm-
10-
export LLVM_DRAGONEGG_PLUGIN=/usr/lib/gcc/x86_64-linux-gnu/4.6/plugin/dragonegg.so
10+
export LLVM_DRAGONEGG_PLUGIN=/usr/lib/gcc/x86_64-linux-gnu/4.7/plugin/dragonegg.so
1111

1212
export WLLVM_OUTPUT=WARNING
1313

14-
APACHE_VER=2.4.18
1514
wget https://archive.apache.org/dist/httpd/httpd-${APACHE_VER}.tar.gz
1615

1716

0 commit comments

Comments
 (0)