Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use portable sed invocation #4494

Merged
merged 6 commits into from
Jul 2, 2024
Merged

Use portable sed invocation #4494

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54bb4af
Use portable sed invocation
Baltoli Jul 2, 2024
6f95a04
Commented
Baltoli Jul 2, 2024
04652a5
Use ..* rather than .+
Baltoli Jul 2, 2024
10a462b
Merge branch 'develop' into portable-sed
Baltoli Jul 2, 2024
397de34
Resolve conflict
Baltoli Jul 2, 2024
a6cd2fe
Merge branch 'portable-sed' of github.com:runtimeverification/k into …
Baltoli Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion k-distribution/include/kframework/ktest-common.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,9 @@ LLVM_KRUN=${K_BIN}/llvm-krun
# and kdep
KDEP=${K_BIN}/kdep
# command to strip paths from test outputs
REMOVE_PATHS=| sed 's!\('`pwd`'\|'${BUILTIN_DIR}'\|/nix/store/.\+/include/kframework/builtin\)/\(\./\)\{0,2\}!!g'
<<<<<<< Updated upstream
REMOVE_PATHS=| sed 's!\('`pwd`'\)/\(\./\)\{0,2\}!!g' | sed 's!\('${BUILTIN_DIR}'\)/\(\./\)\{0,2\}!!g' | sed 's!\('/nix/store/.\+/include/kframework/builtin'\)/\(\./\)\{0,2\}!!g'
=======
# REMOVE_PATHS=| sed 's!\('`pwd`'\|'${BUILTIN_DIR}'\|/nix/store/.\+/include/kframework/builtin\)/\(\./\)\{0,2\}!!g'
REMOVE_PATHS=| sed 's!\('`pwd`'\)/\(\./\)\{0,2\}!!g' | sed 's!\('${BUILTIN_DIR}'\)/\(\./\)\{0,2\}!!g' | sed 's!\('/nix/store/..*/include/kframework/builtin'\)/\(\./\)\{0,2\}!!g'
>>>>>>> Stashed changes
Baltoli marked this conversation as resolved.
Show resolved Hide resolved
Loading