Skip to contentSkip to conversation

selftests/bpf: Silence ima_setup.sh when not running in verbose mode.

PATCH Superseded KP Singh 2 participants 3 messages Dec 9, 2020 – Dec 10, 2020

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

KP Singh

author
#0 lore raw

PATCH v2 1/1 selftests/bpf: Silence ima_setup.sh when not running in verbose mode.

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.

Fixes 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash")
---
 tools/testing/selftests/bpf/ima_setup.sh |  6 ++++++
 tools/testing/selftests/bpf/test_progs.c | 10 ++++++++++
 2 files changed, 16 insertions(+)
tools/testing/selftests/bpf/ima_setup.sh +6 -0
index 2bfc646bc230..7490a9bae33e 100755
@@ -81,9 +81,15 @@ main()
 
 	local action="$1"
 	local tmp_dir="$2"
+	local verbose="${SELFTESTS_VERBOSE:=0}"
 
 	[[ ! -d "${tmp_dir}" ]] && echo "Directory ${tmp_dir} doesn't exist" && exit 1
 
+	if [[ "${verbose}" -eq 0 ]]; then
+		exec 1> /dev/null
+		exec 2>&1
+	fi
+
 	if [[ "${action}" == "setup" ]]; then
 		setup "${tmp_dir}"
 	elif [[ "${action}" == "cleanup" ]]; then
tools/testing/selftests/bpf/test_progs.c +10 -0
index 5ef081bdae4e..7d077d48cadd 100644
@@ -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;
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
#1 lore raw
Quoted 23 lines · KP Singh

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.

Fixes 34b82d3ac105 ("bpf: Add a selftest for bpf_ima_inode_hash")
---
 tools/testing/selftests/bpf/ima_setup.sh |  6 ++++++
 tools/testing/selftests/bpf/test_progs.c | 10 ++++++++++
 2 files changed, 16 insertions(+)
tools/testing/selftests/bpf/ima_setup.sh +0 -0
index 2bfc646bc230..7490a9bae33e 100755

tools/testing/selftests/bpf/ima_setup.sh main() · line 90

Quoted 10 lines
tools/testing/selftests/bpf/ima_setup.sh +4 -0
@@ -81,9 +81,15 @@ main()
 
        local action="$1"
        local tmp_dir="$2"
+       local verbose="${SELFTESTS_VERBOSE:=0}"
 
        [[ ! -d "${tmp_dir}" ]] && echo "Directory ${tmp_dir} doesn't exist" && exit 1
 
+       if [[ "${verbose}" -eq 0 ]]; then
+               exec 1> /dev/null
+               exec 2>&1

can't this be done with one exec, though:

exec 2>&1 1>/dev/null

?

It also actually would be nice to not completely discard the output, but rather redirect it to a temporary file and emit it on error with trap. test_progs behavior is no extra output on success, but emit it fully at the end if test is failing. Would be nice to preserve this for shell script as well, as otherwise debugging this in CI would be nearly impossible.

Quoted 12 lines
tools/testing/selftests/bpf/ima_setup.sh +2 -0
+       fi
+
        if [[ "${action}" == "setup" ]]; then
                setup "${tmp_dir}"
        elif [[ "${action}" == "cleanup" ]]; then
tools/testing/selftests/bpf/test_progs.c +0 -0
index 5ef081bdae4e..7d077d48cadd 100644
@@ -587,6 +587,16 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
                                return -EINVAL;
                        }

tools/testing/selftests/bpf/test_progs.c static error_t parse_arg(int key, char *arg, struct argp_state *state) · line 598

Quoted 10 lines
tools/testing/selftests/bpf/test_progs.c +9 -0
                }
+
+               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;
+                       }
+               }

yep, this is what I had in mind, thanks.

Quoted 7 lines
tools/testing/selftests/bpf/test_progs.c +1 -1
+
                break;
        case ARG_GET_TEST_CNT:
                env->get_test_cnt = true;
--

2.29.2.576.ga3fc446d84-goog

author
#2 lore raw

[...]

Quoted 8 lines

tools/testing/selftests/bpf/ima_setup.sh main() · line 90

Quoted 4 lines
tools/testing/selftests/bpf/ima_setup.sh +3 -0
+       if [[ "${verbose}" -eq 0 ]]; then
+               exec 1> /dev/null
+               exec 2>&1

can't this be done with one exec, though:

exec 2>&1 1>/dev/null

Yep, fixed.

Quoted 10 lines

?

It also actually would be nice to not completely discard the output, but rather redirect it to a temporary file and emit it on error with trap. test_progs behavior is no extra output on success, but emit it fully at the end if test is failing. Would be nice to preserve this for shell script as well, as otherwise debugging this in CI would be nearly impossible.

Yep, this is better for debuggability. I will update and send another version.