* [PATCH bpf-next v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode.
@ 2020-12-11 1:07 KP Singh
2020-12-11 6:19 ` Andrii Nakryiko
2020-12-11 6:20 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: KP Singh @ 2020-12-11 1:07 UTC (permalink / raw)
To: bpf; +Cc: Andrii Nakryiko, Alexei Starovoitov, Daniel Borkmann
Currently, ima_setup.sh spews outputs from commands like mkfs and dd
on the terminal without taking into account the verbosity level of
the test framework. Update test_progs to set the environment variable
SELFTESTS_VERBOSE=1 when a verbose output is requested. This
environment variable is then used by ima_setup.sh (and can be used by
other similar scripts) to obey the verbosity level of the test harness
without needing to re-implement command line options for verbosity.
In "silent" mode, the script saves the output to a temporary file, the
contents of which are echoed back to stderr when the script encounters
an error.
Fixes: 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash")
Reported-by: Andrii Nakryiko <andrii@kernel.org>
Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: KP Singh <kpsingh@kernel.org>
---
tools/testing/selftests/bpf/ima_setup.sh | 24 ++++++++++++++++++++++++
tools/testing/selftests/bpf/test_progs.c | 10 ++++++++++
2 files changed, 34 insertions(+)
diff --git a/tools/testing/selftests/bpf/ima_setup.sh b/tools/testing/selftests/bpf/ima_setup.sh
index 2bfc646bc230..8e62581113a3 100755
--- a/tools/testing/selftests/bpf/ima_setup.sh
+++ b/tools/testing/selftests/bpf/ima_setup.sh
@@ -7,6 +7,8 @@ set -o pipefail
IMA_POLICY_FILE="/sys/kernel/security/ima/policy"
TEST_BINARY="/bin/true"
+VERBOSE="${SELFTESTS_VERBOSE:=0}"
+LOG_FILE="$(mktemp /tmp/ima_setup.XXXX.log)"
usage()
{
@@ -75,6 +77,19 @@ run()
exec "${copied_bin_path}"
}
+catch()
+{
+ local exit_code="$1"
+ local log_file="$2"
+
+ if [[ "${exit_code}" -ne 0 ]]; then
+ cat "${log_file}" >&3
+ fi
+
+ rm -f "${log_file}"
+ exit ${exit_code}
+}
+
main()
{
[[ $# -ne 2 ]] && usage
@@ -96,4 +111,13 @@ main()
fi
}
+trap 'catch "$?" "${LOG_FILE}"' EXIT
+
+if [[ "${VERBOSE}" -eq 0 ]]; then
+ # Save the stderr to 3 so that we can output back to
+ # it incase of an error.
+ exec 3>&2 1>"${LOG_FILE}" 2>&1
+fi
+
main "$@"
+rm -f "${LOG_FILE}"
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 5ef081bdae4e..7d077d48cadd 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -587,6 +587,16 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
return -EINVAL;
}
}
+
+ if (env->verbosity > VERBOSE_NONE) {
+ if (setenv("SELFTESTS_VERBOSE", "1", 1) == -1) {
+ fprintf(stderr,
+ "Unable to setenv SELFTESTS_VERBOSE=1 (errno=%d)",
+ errno);
+ return -1;
+ }
+ }
+
break;
case ARG_GET_TEST_CNT:
env->get_test_cnt = true;
--
2.29.2.576.ga3fc446d84-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode.
2020-12-11 1:07 [PATCH bpf-next v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode KP Singh
@ 2020-12-11 6:19 ` Andrii Nakryiko
2020-12-11 6:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2020-12-11 6:19 UTC (permalink / raw)
To: KP Singh; +Cc: bpf, Andrii Nakryiko, Alexei Starovoitov, Daniel Borkmann
On Thu, Dec 10, 2020 at 5:07 PM KP Singh <kpsingh@kernel.org> wrote:
>
> Currently, ima_setup.sh spews outputs from commands like mkfs and dd
> on the terminal without taking into account the verbosity level of
> the test framework. Update test_progs to set the environment variable
> SELFTESTS_VERBOSE=1 when a verbose output is requested. This
> environment variable is then used by ima_setup.sh (and can be used by
> other similar scripts) to obey the verbosity level of the test harness
> without needing to re-implement command line options for verbosity.
>
> In "silent" mode, the script saves the output to a temporary file, the
> contents of which are echoed back to stderr when the script encounters
> an error.
>
> Fixes: 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash")
> Reported-by: Andrii Nakryiko <andrii@kernel.org>
> Suggested-by: Andrii Nakryiko <andrii@kernel.org>
> Signed-off-by: KP Singh <kpsingh@kernel.org>
> ---
This looks great, thank you. Applied.
> tools/testing/selftests/bpf/ima_setup.sh | 24 ++++++++++++++++++++++++
> tools/testing/selftests/bpf/test_progs.c | 10 ++++++++++
> 2 files changed, 34 insertions(+)
>
[...]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode.
2020-12-11 1:07 [PATCH bpf-next v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode KP Singh
2020-12-11 6:19 ` Andrii Nakryiko
@ 2020-12-11 6:20 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2020-12-11 6:20 UTC (permalink / raw)
To: KP Singh; +Cc: bpf, andrii, ast, daniel
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
On Fri, 11 Dec 2020 01:07:11 +0000 you wrote:
> Currently, ima_setup.sh spews outputs from commands like mkfs and dd
> on the terminal without taking into account the verbosity level of
> the test framework. Update test_progs to set the environment variable
> SELFTESTS_VERBOSE=1 when a verbose output is requested. This
> environment variable is then used by ima_setup.sh (and can be used by
> other similar scripts) to obey the verbosity level of the test harness
> without needing to re-implement command line options for verbosity.
>
> [...]
Here is the summary with links:
- [bpf-next,v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode.
https://git.kernel.org/bpf/bpf-next/c/b4fe9fec51ef
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-11 6:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-11 1:07 [PATCH bpf-next v3] selftests/bpf: Silence ima_setup.sh when not running in verbose mode KP Singh
2020-12-11 6:19 ` Andrii Nakryiko
2020-12-11 6:20 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.