Skip to content

Commit

Permalink
remove coverage (#1062)
Browse files Browse the repository at this point in the history
* remove coverage

* remove coverage condition
  • Loading branch information
mapsam committed Oct 24, 2018
1 parent 33ba84c commit c191e61
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 32 deletions.
19 changes: 0 additions & 19 deletions .travis.yml
Expand Up @@ -60,13 +60,6 @@ matrix:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5']
- os: linux
compiler: clang
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5']
- os: linux
compiler: clang
env: NODE_VERSION="4"
Expand All @@ -83,9 +76,6 @@ matrix:
sources: [ 'ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5', 'gcc-multilib', 'g++-multilib', 'libsqlite3-dev:i386' ]
packages: [ 'clang-3.5','libsqlite3-dev']
# OS X
- os: osx
compiler: clang
env: NODE_VERSION="5" COVERAGE=true PUBLISHABLE=false # node abi 47
- os: osx
compiler: clang
env: NODE_VERSION="10" # node abi 64
Expand Down Expand Up @@ -175,7 +165,6 @@ env:

before_install:
- export PUBLISHABLE=${PUBLISHABLE:-true}
- export COVERAGE=${COVERAGE:-false}
- if [[ $(uname -s) == 'Linux' ]]; then
export CXX="clang++-3.5";
export CC="clang-3.5";
Expand All @@ -193,14 +182,6 @@ install:
before_script:
# get commit message
- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
- if [[ ${COVERAGE} == true ]]; then
if [[ $(uname -s) == 'Linux' ]]; then
curl https://bootstrap.pypa.io/get-pip.py | python - --user;
pip install --user cpp-coveralls;
else
PYTHONUSERBASE=$(pwd)/py-local easy_install --user cpp-coveralls;
fi;
fi

script:
- if [[ "${NODE_VERSION}" ]]; then
Expand Down
18 changes: 5 additions & 13 deletions scripts/build_against_node.sh
Expand Up @@ -13,19 +13,11 @@ function publish() {
fi
}

# test installing from source
if [[ ${COVERAGE} == true ]]; then
CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source --clang=1
npm test
cpp-coveralls --exclude node_modules --exclude tests --build-root build --gcov-options '\-lp' --exclude docs --exclude build/Release/obj/gen --exclude deps > /dev/null
else
echo "building binaries for publishing"
CFLAGS="${CFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" V=1 npm install --build-from-source --clang=1
nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" | c++filt || true
nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true
npm test
fi

echo "building binaries for publishing"
CFLAGS="${CFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" CXXFLAGS="${CXXFLAGS:-} -include $(pwd)/src/gcc-preinclude.h" V=1 npm install --build-from-source --clang=1
nm lib/binding/*/node_sqlite3.node | grep "GLIBCXX_" | c++filt || true
nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true
npm test

publish

Expand Down

0 comments on commit c191e61

Please sign in to comment.