diff --git a/pyfeeds/main.py b/pyfeeds/main.py index 659985356a3033aa20950abb31b87be9785bc3ec..652a2eb104d7a72baff83c7666cd95ae140454aa 100755 --- a/pyfeeds/main.py +++ b/pyfeeds/main.py @@ -62,6 +62,7 @@ upon which sub-command the user has specified: import os.path as op import os +import pathlib as pl import sys import logging import fnmatch @@ -226,10 +227,20 @@ class Pyfeeds: testDirs = functools.reduce(lambda a, b: a + b, testDirs) testDirs = sorted(set(testDirs)) + testDirs = [op.abspath(td) for td in testDirs] if len(testDirs) == 0: return [] + # Do not consider anything within the + # input, benchmark, or output directories + indir = pl.Path(op.abspath(self.inputDir)) + bmdir = pl.Path(op.abspath(self.benchmarkDir)) + outdir = pl.Path(op.abspath(self.outputDir)) + testDirs = [td for td in testDirs if indir not in pl.Path(td).parents] + testDirs = [td for td in testDirs if bmdir not in pl.Path(td).parents] + testDirs = [td for td in testDirs if outdir not in pl.Path(td).parents] + # Find the deepest directory in # the file system which contains # all of the detected tests.