more coverage fixes

Dane Springmeyer · Dane Springmeyer · commit fd0d233ff5f9 · 2015-11-02T15:01:06.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -37,8 +37,11 @@ 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";
+    export CXX="clang++-3.5";
+    export CC="clang-3.5";
+    export PYTHONPATH=$(pwd)/py-local/lib/python2.7/site-packages;
+  else
+    export PYTHONPATH=$(pwd)/py-local/lib/python/site-packages;
   fi;
 - scripts/validate_tag.sh
 - source ./scripts/install_node.sh ${NODE_VERSION}
@@ -52,9 +55,9 @@ before_script:
 - export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
 - if [[ ${COVERAGE} == true ]]; then
      if [[ $(uname -s) == 'Linux' ]]; then
-       PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user cpp-coveralls;
+       PYTHONUSERBASE=$(pwd)/py-local pip install --user cpp-coveralls;
      else
-       PYTHONUSERBASE=$(pwd)/mason_packages/.link easy_install --user cpp-coveralls;
+       PYTHONUSERBASE=$(pwd)/py-local easy_install --user cpp-coveralls;
      fi;
    fi
 
diff --git a/scripts/build_against_node.sh b/scripts/build_against_node.sh
@@ -17,7 +17,7 @@ function publish() {
 if [[ ${COVERAGE} == true ]]; then
     CXXFLAGS="--coverage" LDFLAGS="--coverage" npm install --build-from-source  --clang=1 --verbose
     npm test
-    ./mason_packages/.link/bin/cpp-coveralls --exclude node_modules --exclude tests --build-root build --gcov-options '\-lp' --exclude docs --exclude build/Release/obj/gen --exclude deps
+    ./py-local/bin/cpp-coveralls --exclude node_modules --exclude tests --build-root build --gcov-options '\-lp' --exclude docs --exclude build/Release/obj/gen --exclude deps
 else
     npm install --build-from-source  --clang=1
     npm test
