From c191e61ec59e26c8bbbff1a6508204fd98f41043 Mon Sep 17 00:00:00 2001 From: Sam Matthews Date: Wed, 24 Oct 2018 09:00:05 -0700 Subject: [PATCH] remove coverage (#1062) * remove coverage * remove coverage condition --- .travis.yml | 19 ------------------- scripts/build_against_node.sh | 18 +++++------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5ea2ba57..1522cea74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" @@ -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 @@ -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"; @@ -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 diff --git a/scripts/build_against_node.sh b/scripts/build_against_node.sh index e018d12f5..d75b1c738 100755 --- a/scripts/build_against_node.sh +++ b/scripts/build_against_node.sh @@ -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