Skip to content

Ltp skipfile kirk - #643

Merged
bhcopeland merged 4 commits into
Linaro:masterfrom
roxell:ltp-skipfile-kirk
Sep 23, 2026
Merged

bhcopeland merged 4 commits into
Linaro:masterfrom
roxell:ltp-skipfile-kirk

Conversation

@roxell

@roxell roxell commented Sep 23, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

@roxell
roxell requested a review from bhcopeland September 23, 2026 12:39
A plain text skipfile never reaches kirk, so the tests in it still run.

The -S option stores the path in SKIPFILE, but the kirk command line
only uses SKIPFILE_PATH, and that one is set for yaml skipfiles only.
So --skip-file is dropped and SKIPFILE is never read again.

When kirk was added runltp was still the default, and runltp did read
SKIPFILE. Only kirk users saw this. Dropping runltp made kirk the only
runner, and now it hits everyone.

Set SKIPFILE_PATH for the plain skipfile too and drop SKIPFILE.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
The check only runs for yaml skipfiles. A plain skipfile with a bad
path goes straight to kirk, and kirk dies on it with a python
traceback.

Move the check out of the yaml branch so it covers both kinds.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
An absolute path to a yaml skipfile gets SCRIPTPATH glued in front of
it, so it ends up as ${SCRIPTPATH}//abs/path. That file can not exist.

The plain skipfile branch already checks for a leading slash. Do the
same for the yaml branch.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
The -S option is parsed with nested ifs and string strip tests, three
levels deep. Two of the comments only repeat the branch above them.

So let's use a case instead. A case arm takes alternatives, so the
http and the yaml test fit in one flat pattern, and the patterns say
what the comments said. SKIPFILE_TMP can go too, wget writes straight
to the skipfile variable.

Do the relative path rule once after the option loop instead of in
each branch.

No functional change.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
@bhcopeland
bhcopeland merged commit 74c645a into Linaro:master Sep 23, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants