mv contrib/cmd tests/cmd (except memfd-bind) #4377
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rata
previously approved these changes
Aug 14, 2024
bc54f44
to
22583fc
Compare
|
Updated |
22583fc
to
d86d8e9
Compare
lifubang
reviewed
Aug 15, 2024
Makefile
Outdated
| @@ -79,6 +79,8 @@ runc-bin: runc-dmz | |||
|
|
|||
| .PHONY: all | |||
| all: runc recvtty sd-helper seccompagent fs-idmap memfd-bind pidfd-kill remap-rootfs | |||
| @echo "*Note*: Only the runc binary should be installed to user environments." | |||
There was a problem hiding this comment.
Please add a new line after *Note*: , or add 8 spaces before Other binaries...?
I think it will looks more beautiful.
There was a problem hiding this comment.
Maybe something like
@echo "To distro maintainers: this is not make target you're looking for. Use runc or runc-static."There was a problem hiding this comment.
Or maybe don't make make more talkative at all.
|
In fact, we have
Edited: I miscounted it last night :) |
The following commands are moved from `contrib/cmd` to `tests/cmd`: - fs-idmap - pidfd-kill - recvtty - remap-rootfs - sd-helper - seccompagent Signed-off-by: Akihiro Suda <[email protected]>
d86d8e9
to
f76489f
Compare
|
Updated as suggested |
|
Would moving things to |
When writing the above comment yesterday, I was going to suggest I think Also, two of the programs (recvtty and seccomagent) are also used as code examples, so they are not entirely "internal". |
kolyshkin
reviewed
Aug 16, 2024
Comment on lines
+16
to
+21
| RECVTTY="${INTEGRATION_ROOT}/../../tests/cmd/recvtty/recvtty" | ||
| SD_HELPER="${INTEGRATION_ROOT}/../../tests/cmd/sd-helper/sd-helper" | ||
| SECCOMP_AGENT="${INTEGRATION_ROOT}/../../tests/cmd/seccompagent/seccompagent" | ||
| FS_IDMAP="${INTEGRATION_ROOT}/../../tests/cmd/fs-idmap/fs-idmap" | ||
| PIDFD_KILL="${INTEGRATION_ROOT}/../../tests/cmd/pidfd-kill/pidfd-kill" | ||
| REMAP_ROOTFS="${INTEGRATION_ROOT}/../../tests/cmd/remap-rootfs/remap-rootfs" |
There was a problem hiding this comment.
nit: all these should now be like "${INTEGRATION_ROOT}/../cmd/remap-rootfs/remap-rootfs"
kolyshkin
reviewed
Aug 16, 2024
| @@ -214,7 +214,7 @@ function scmp_act_notify_template() { | |||
| @test "runc run [seccomp] (SCMP_ACT_NOTIFY example config)" { | |||
| # Run the script used in the seccomp agent example. | |||
| # This takes a bare config.json and modifies it to run an example. | |||
| "${INTEGRATION_ROOT}/../../contrib/cmd/seccompagent/gen-seccomp-example-cfg.sh" | |||
| "${INTEGRATION_ROOT}/../../tests/cmd/seccompagent/gen-seccomp-example-cfg.sh" | |||
There was a problem hiding this comment.
Suggested change
| "${INTEGRATION_ROOT}/../../tests/cmd/seccompagent/gen-seccomp-example-cfg.sh" | |
| "${INTEGRATION_ROOT}/../cmd/seccompagent/gen-seccomp-example-cfg.sh" |
kolyshkin
reviewed
Aug 16, 2024
Comment on lines
+16
to
+21
| RECVTTY="${INTEGRATION_ROOT}/../../tests/cmd/recvtty/recvtty" | ||
| SD_HELPER="${INTEGRATION_ROOT}/../../tests/cmd/sd-helper/sd-helper" | ||
| SECCOMP_AGENT="${INTEGRATION_ROOT}/../../tests/cmd/seccompagent/seccompagent" | ||
| FS_IDMAP="${INTEGRATION_ROOT}/../../tests/cmd/fs-idmap/fs-idmap" | ||
| PIDFD_KILL="${INTEGRATION_ROOT}/../../tests/cmd/pidfd-kill/pidfd-kill" | ||
| REMAP_ROOTFS="${INTEGRATION_ROOT}/../../tests/cmd/remap-rootfs/remap-rootfs" |
There was a problem hiding this comment.
IOW
Suggested change
| RECVTTY="${INTEGRATION_ROOT}/../../tests/cmd/recvtty/recvtty" | |
| SD_HELPER="${INTEGRATION_ROOT}/../../tests/cmd/sd-helper/sd-helper" | |
| SECCOMP_AGENT="${INTEGRATION_ROOT}/../../tests/cmd/seccompagent/seccompagent" | |
| FS_IDMAP="${INTEGRATION_ROOT}/../../tests/cmd/fs-idmap/fs-idmap" | |
| PIDFD_KILL="${INTEGRATION_ROOT}/../../tests/cmd/pidfd-kill/pidfd-kill" | |
| REMAP_ROOTFS="${INTEGRATION_ROOT}/../../tests/cmd/remap-rootfs/remap-rootfs" | |
| RECVTTY="${INTEGRATION_ROOT}/../cmd/recvtty/recvtty" | |
| SD_HELPER="${INTEGRATION_ROOT}/../cmd/sd-helper/sd-helper" | |
| SECCOMP_AGENT="${INTEGRATION_ROOT}/../cmd/seccompagent/seccompagent" | |
| FS_IDMAP="${INTEGRATION_ROOT}/../cmd/fs-idmap/fs-idmap" | |
| PIDFD_KILL="${INTEGRATION_ROOT}/../cmd/pidfd-kill/pidfd-kill" | |
| REMAP_ROOTFS="${INTEGRATION_ROOT}/../cmd/remap-rootfs/remap-rootfs" |
(not tested)
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following commands are moved from
contrib/cmdtotests/cmd:So as to clarify that distro maintainers should not include these binaries in their package.
ref: https://bugs.launchpad.net/ubuntu/+source/runc/+bug/2076981