Skip to content

Commit 2016233

Browse files
committed
Update Travis file
1 parent 48d7993 commit 2016233

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.travis.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ language: c
22

33
sudo: false
44

5+
env:
6+
global:
7+
- LCURL_CC_FLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs"
8+
- LCURL_LD_FLAGS="-shared --coverage"
9+
510
matrix:
611
include:
7-
- compiler: ": Lua51osx"
12+
- compiler: ": Lua51-osx"
813
env: LUA="lua 5.1"
914
os: osx
1015
- compiler: ": Lua51"
@@ -36,19 +41,20 @@ before_install:
3641
- export CC=gcc
3742
- gcc --version
3843
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$PATH:~/Library/Python/2.7/bin/; fi
44+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LCURL_LD_FLAGS="-bundle -undefined dynamic_lookup -all_load --coverage"; fi
3945
- pip install --user cpp-coveralls
4046
- pip install --user hererocks
4147
- hererocks here -r^ --$LUA
4248
- source here/bin/activate
4349

4450
install:
45-
- luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
51+
- luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="$LCURL_CC_FLAGS" LIBFLAG="$LCURL_LD_FLAGS"
4652

4753
before_script:
48-
- luarocks show luacov-coveralls || luarocks install luacov-coveralls
49-
- luarocks show lunitx || luarocks install lunitx
50-
- luarocks show luafilesystem || luarocks install luafilesystem
51-
- luarocks show dkjson || luarocks install dkjson --deps-mode=none
54+
- luarocks show luacov-coveralls > /dev/null 2>&1 || luarocks install luacov-coveralls
55+
- luarocks show lunitx > /dev/null 2>&1 || luarocks install lunitx
56+
- luarocks show luafilesystem > /dev/null 2>&1 || luarocks install luafilesystem
57+
- luarocks show dkjson > /dev/null 2>&1 || luarocks install dkjson --deps-mode=none
5258

5359
script:
5460
- cd test

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ platform:
2121

2222
cache:
2323
- c:\hererocks -> appveyor.yml
24+
- c:\external -> appveyor.yml
2425

2526
install:
2627
- set PATH=C:\Python27\Scripts;%LR_EXTERNAL%;%PATH%

0 commit comments

Comments
 (0)