Merge pull request #86 from lsst/tickets/DM-29139a

DM-29139: Update ignore glob in pytest test collection to include *.tmp
lsst · Mar 11, 2021 · 8076a8c · 8076a8c
2 parents 7199c6c + 182cbb6
commit 8076a8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/python/lsst/sconsUtils/scripts.py b/python/lsst/sconsUtils/scripts.py
@@ -658,7 +658,6 @@ def s(ll):
             state.env.Depends(pyTest, swigMods)
             state.env.Depends(pyTest, state.targets["python"])
             state.env.Depends(pyTest, state.targets["shebang"])
-            state.env.Depends(pyTest, state.targets["examples"])
         result = ccList + pyList
         state.targets["tests"].extend(result)
         return result

diff --git a/python/lsst/sconsUtils/tests.py b/python/lsst/sconsUtils/tests.py
@@ -341,6 +341,10 @@ def runPythonTests(self, pyList):
         # test collection
         interpreter += " --ignore=doc/html --ignore=doc/xml"
 
+        # Also include temporary files made by compilers.
+        # These can come from examples directories that include C++.
+        interpreter += " --ignore-glob='*.tmp'"
+
         target = os.path.join(self._tmpDir, "pytest-{}.xml".format(self._env['eupsProduct']))
 
         # Work out how many jobs scons has been configured to use