Merge branch 'master' of github.com:SCons/scons

3 files changed, 31 insertions, 12 deletions

diff --git a/.travis/.coveragerc b/.travis/.coveragerc
deleted file mode 100644
index 3aaf35b..0000000
--- a/.travis/.coveragerc
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "[run]" >> .coveragerc
-echo "source = $PWD/SCons" >> .coveragerc
-echo "parallel = True" >> .coveragerc
-printf "omit =\n\t*Tests.py\n\tsrc/test_*\n\tsetup.py\n\n" >> .coveragerc
-echo "[path]" >> .coveragerc
-echo "source = $PWD" >> .coveragerc
-echo "[report]" >> .coveragerc
-printf "omit =\n\t*Tests.py\n\tsrc/test_*\n\tsetup.py\n\n" >> .coveragerc
diff --git a/.travis/coverage_setup.sh b/.travis/coverage_setup.sh
new file mode 100755
index 0000000..e71fde8
--- /dev/null
+++ b/.travis/coverage_setup.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+python -m pip install -U coverage codecov
+
+# setup sitecustomize so we can make all subprocess start coverage
+export PYSITEDIR=$(python -c "import sys; print(sys.path[-1])")
+mkdir -p "$PYSITEDIR"
+
+# coverage.py environment variable for multiprocess
+export COVERAGE_PROCESS_START="$PWD/.coveragerc"
+export COVERAGE_FILE="$PWD/.coverage"
+
+# replace PWD in the template files so we have absolute paths from out /tmp test folders
+sed -e "s#\$PWD#$PWD#" .coverage_templates/.coveragerc.template > "$PWD/.coveragerc"
+sed -e "s#\$PWD#$PWD#" .coverage_templates/sitecustomize.py.template > "${PYSITEDIR}/sitecustomize.py"
+
+# print the results
+echo "${PYSITEDIR}/sitecustomize.py"
+cat "${PYSITEDIR}/sitecustomize.py"
+echo "$PWD/.coveragerc"
+cat "$PWD/.coveragerc"
diff --git a/.travis/install.sh b/.travis/install.sh
index 597af4c..92c80c8 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -40,9 +40,14 @@ else
     sudo apt-get -y install python-pip python-dev build-essential libpcre3-dev autoconf automake libtool bison subversion git
 
     # dependencies for D tests
-    sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
-    wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add -
-    sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin
+    sudo wget https://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
+    sudo apt-get update --allow-insecure-repositories
+    sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring
+    sudo apt-get update && sudo apt-get install dmd-compiler dub
+
+#    sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
+#    wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add -
+#    sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin
 
     # dependencies for ldc tests
     export SCONS_LDC_VERSION=1.21.0
@@ -51,5 +56,6 @@ else
     tar xf ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz
     sudo cp -rf ldc2-${SCONS_LDC_VERSION}-linux-x86_64/* /
 
-    ls -l /usr/lib*/*python*{so,a}*
+    # Failing.. ?
+#    ls -l /usr/lib*/*python*{so,a}*
 fi