summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rw-r--r--test/Repository/M4.py4
-rw-r--r--test/exitfns.py6
3 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 5703419..22fb9d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,10 +82,6 @@ jobs:
# - n=0; while [[ $n -lt 10 ]]; do coverage run --rcfile=$PWD/.coveragerc runtest.py src/engine/SCons/JobTests.py && break; n=$((n+1)); done; if [ "$n" -gt "9" ]; then false; fi
# exclude JobTest.py becuase we already ran that
- echo "src/engine/SCons/JobTests.py" > exclude_jobtest
- # also exclude this test since it overides the exit function which doesnt work with coverage
- # more info here: https://coverage.readthedocs.io/en/coverage-4.4.2/subprocess.html#
- # TODO: figure out how to cover test/exitfns.py
- - echo "test/exitfns.py" >> exclude_jobtest
- python runtest.py -l -a --exclude-list exclude_jobtest > all_tests
- let "start = ($(wc -l < all_tests) / ${TOTAL_BUILD_JOBS}) * (${BUILD_JOB_NUM} - 1)"; true;
- let "end = ($(wc -l < all_tests) / ${TOTAL_BUILD_JOBS}) * ${BUILD_JOB_NUM}"
diff --git a/test/Repository/M4.py b/test/Repository/M4.py
index fe1eb7b..29647e9 100644
--- a/test/Repository/M4.py
+++ b/test/Repository/M4.py
@@ -36,6 +36,10 @@ _python_ = TestSCons._python_
test = TestSCons.TestSCons()
+# TODO: figure out how to write the coverage data to the locked folder or maybe somewhere else
+if 'COVERAGE_PROCESS_START' in os.environ:
+ test.skip_test("this test locks the folder for writing meaning coverage data can not be written; skipping test.")
+
test.subdir('work', 'repository', ['repository', 'src'])
test.write('mym4.py', """
diff --git a/test/exitfns.py b/test/exitfns.py
index d1bda3a..dcd8762 100644
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -28,6 +28,12 @@ import TestSCons
test = TestSCons.TestSCons()
+# also exclude these tests since it overides the exit function which doesnt work with coverage
+# # more info here: https://coverage.readthedocs.io/en/coverage-4.4.2/subprocess.html#
+# TODO: figure out how to cover tests which use exit functions
+if 'COVERAGE_PROCESS_START' in os.environ:
+ test.skip_test("This test replaces the exit function which is needed by coverage to write test data; skipping test.")
+
sconstruct = """
from SCons.exitfuncs import *