emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this is a dirty hack, but it solves the Program builder not honoring LDFLAGS

Browse source
This commit is contained in:
Meredith L. Patterson 2015-10-04 01:43:44 +02:00
parent 10997afcbb
commit ff65571474
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.travis.yml
View file

@ -13,7 +13,7 @@ matrix:
- compiler: clang - compiler: clang
language: ruby language: ruby
rvm: ruby-1.9.3-p484 rvm: ruby-1.9.3-p484
env: BINDINGS=ruby CC=clang env: BINDINGS=ruby CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: ruby language: ruby
rvm: ruby-2.0.0-p353 rvm: ruby-2.0.0-p353
@ -21,7 +21,7 @@ matrix:
- compiler: clang - compiler: clang
language: ruby language: ruby
rvm: ruby-2.0.0-p353 rvm: ruby-2.0.0-p353
env: BINDINGS=ruby CC=clang env: BINDINGS=ruby CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: ruby language: ruby
rvm: ruby-2.1.0 rvm: ruby-2.1.0
@ -29,7 +29,7 @@ matrix:
- compiler: clang - compiler: clang
language: ruby language: ruby
rvm: ruby-2.1.0 rvm: ruby-2.1.0
env: BINDINGS=ruby CC=clang env: BINDINGS=ruby CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: python language: python
python: "2.7" python: "2.7"
@ -37,7 +37,7 @@ matrix:
- compiler: clang - compiler: clang
language: python language: python
python: "2.7" python: "2.7"
env: BINDINGS=python CC=clang env: BINDINGS=python CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: perl language: perl
perl: "5.18" perl: "5.18"
@ -45,7 +45,7 @@ matrix:
- compiler: clang - compiler: clang
language: perl language: perl
perl: "5.18" perl: "5.18"
env: BINDINGS=perl CC=clang env: BINDINGS=perl CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: perl language: perl
perl: "5.14" perl: "5.14"
@ -53,7 +53,7 @@ matrix:
- compiler: clang - compiler: clang
language: perl language: perl
perl: "5.14" perl: "5.14"
env: BINDINGS=perl CC=clang env: BINDINGS=perl CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: perl language: perl
perl: "5.10" perl: "5.10"
@ -61,7 +61,7 @@ matrix:
- compiler: clang - compiler: clang
language: perl language: perl
perl: "5.10" perl: "5.10"
env: BINDINGS=perl CC=clang env: BINDINGS=perl CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: php language: php
php: "5.5" php: "5.5"
@ -69,7 +69,7 @@ matrix:
- compiler: clang - compiler: clang
language: php language: php
php: "5.5" php: "5.5"
env: BINDINGS=php CC=clang env: BINDINGS=php CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: php language: php
php: "5.4" php: "5.4"
@ -77,19 +77,19 @@ matrix:
- compiler: clang - compiler: clang
language: php language: php
php: "5.4" php: "5.4"
env: BINDINGS=php CC=clang env: BINDINGS=php CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: dotnet language: dotnet
env: BINDINGS=dotnet env: BINDINGS=dotnet
- compiler: clang - compiler: clang
language: dotnet language: dotnet
env: BINDINGS=dotnet CC=clang env: BINDINGS=dotnet CC="clang --coverage"
- compiler: gcc - compiler: gcc
language: cpp language: cpp
env: BINDINGS=cpp env: BINDINGS=cpp
- compiler: gcc - compiler: gcc
language: cpp language: cpp
env: BINDINGS=cpp CC=clang env: BINDINGS=cpp CC="clang --coverage"
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install lcov - sudo apt-get install lcov
@ -102,9 +102,9 @@ install: true
before_script: before_script:
- if [ "$BINDINGS" == "php" ]; then phpenv config-add src/bindings/php/hammer.ini; fi - if [ "$BINDINGS" == "php" ]; then phpenv config-add src/bindings/php/hammer.ini; fi
script: script:
- scons bindings=$BINDINGS test --coverage - scons bindings=$BINDINGS test --variant=debug --coverage
after_success: after_success:
- lcov --capture --directory build/opt/src --output-file coverage.info - if [ "$CC" == "clang --coverage" ]; then llvm-cov gcov -o coverage.info build/debug/src/test_suite.gcda; else lcov --capture --directory build/debug/src --output-file coverage.info; fi
- coveralls-lcov coverage.info - coveralls-lcov coverage.info
notifications: notifications:
irc: irc:

3
SConstruct
View file

@ -93,8 +93,7 @@ else:
if GetOption("coverage"): if GetOption("coverage"):
env.Append(CFLAGS=["--coverage"], env.Append(CFLAGS=["--coverage"],
CXXFLAGS=["--coverage"], CXXFLAGS=["--coverage"],
LDFLAGS=["--coverage"], LDFLAGS=["--coverage"])
LIBS=['gcov'])
env["CC"] = os.getenv("CC") or env["CC"] env["CC"] = os.getenv("CC") or env["CC"]
env["CXX"] = os.getenv("CXX") or env["CXX"] env["CXX"] = os.getenv("CXX") or env["CXX"]