comparison tests/run-tests.py @ 45513:22140fd783d2

run-test: allow relative path in `--blacklist` and `--whitelist` (issue6351)

When specifying a test with `--blacklist` or `--whitelist` with path relatives
to the repository root (eg: `tests/test-check-commit.t`) the file is not taken
into account. It only works when the name of the test is given.

It would be better if `--blacklist` and `--whitelist` behaviors where compatible
with `--test-list`.

This patch allows to use relative path with `--blacklist` and `--whitelist`
while staying compatible with the old behavior by checking the test relative
path in addition to its name.

Differential Revision: https://phab.mercurial-scm.org/D9024

45512:b4abfe142ff6

        if startport is None:
            startport = defaults['port']
        if slowtimeout is None:
            slowtimeout = defaults['slowtimeout']
        self.path = path
        self.bname = os.path.basename(path)
        self.name = _bytes2sys(self.bname)
        self._testdir = os.path.dirname(path)
        self._outputdir = outputdir
        self._tmpname = os.path.basename(path)

            if not os.path.exists(test.path):
                result.addSkip(test, "Doesn't exist")
                continue

            if not (self._whitelist and test.bname in self._whitelist):
                if self._blacklist and test.bname in self._blacklist:
                    result.addSkip(test, 'blacklisted')
                    continue

                if self._keywords:
                    with open(test.path, 'rb') as f:
                        t = f.read().lower() + test.bname.lower()
                    ignored = False
                    for k in self._keywords.lower().split():

45513:22140fd783d2

        if startport is None:
            startport = defaults['port']
        if slowtimeout is None:
            slowtimeout = defaults['slowtimeout']
        self.path = path
        self.relpath = os.path.relpath(path)
        self.bname = os.path.basename(path)
        self.name = _bytes2sys(self.bname)
        self._testdir = os.path.dirname(path)
        self._outputdir = outputdir
        self._tmpname = os.path.basename(path)

            if not os.path.exists(test.path):
                result.addSkip(test, "Doesn't exist")
                continue

            is_whitelisted = self._whitelist and (
                test.relpath in self._whitelist or test.bname in self._whitelist
            )
            if not is_whitelisted:
                is_blacklisted = self._blacklist and (
                    test.relpath in self._blacklist
                    or test.bname in self._blacklist
                )
                if is_blacklisted:
                    result.addSkip(test, 'blacklisted')
                    continue
                if self._keywords:
                    with open(test.path, 'rb') as f:
                        t = f.read().lower() + test.bname.lower()
                    ignored = False
                    for k in self._keywords.lower().split():