Fix so "make check" does not pick up tox results

diff --git a/Makefile b/Makefile
index 7078d697d11adafa6287eaf58808a63736743a52..7f1ab7096bb3c5339f7e002cdb84713caaf8130c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,4 +31,17 @@ export COV_CORE_CONFIG   := .coveragerc
 export COV_CORE_DATAFILE := .coverage.eager
 
 # For clean
-COVERAGE_STUFF := $(COVERAGE_STUFF) .coverage.*
+COVERAGE_DATA := .coverage .coverage.*
+COVERAGE_STUFF := $(COVERAGE_STUFF) $(COVERAGE_DATA)
+
+# Because we're testing fixtures we need to accumulate
+# coverage data with --cov-append for pytest.  But this
+# leaves coverage data files laying about which interfere
+# with subsequent runs.  Remove the old data before
+# running pytest again.
+
+.PHONY: rm_coverage_data
+rm_coverage_data:
+       rm -f $(COVERAGE_DATA)
+
+check: rm_coverage_data

diff --git a/README.rst b/README.rst
index 6b9b7cce44c3be863aecde1b0a5c5461e38ce231..4bab1046130bdfe1bdaf0b67f54e377082e7c6e4 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -22,7 +22,6 @@
 .. #End Of Copyright Marker#
 
 .. Bugs:  (Due to fixture testing)
-   "make check" picks up tox tests
    "make run_tests" leaves .coverage.eager.* files about
    Probably we need to get rid of the .coverage files in both cases.
      (removing .coverage fixes "make check" pickup of tox dirs)