[bpf-next,v3,4/4] selftests/bpf: Indent ima_setup.sh with tabs.

Commit Message

KP Singh Dec. 3, 2020, 12:58 a.m. UTC

From: KP Singh <[e-mail]>

Signed-off-by: KP Singh <[e-mail]>
---
 tools/testing/selftests/bpf/ima_setup.sh | 108 +++++++++++------------
 1 file changed, 54 insertions(+), 54 deletions(-)

Comments

Andrii Nakryiko Dec. 3, 2020, 5:46 a.m. UTC | #1

On Wed, Dec 2, 2020 at 4:58 PM KP Singh <[e-mail]> wrote:
>
> From: KP Singh <[e-mail]>
>

Commit message is missing completely.

> Signed-off-by: KP Singh <[e-mail]>
> ---
>  tools/testing/selftests/bpf/ima_setup.sh | 108 +++++++++++------------
>  1 file changed, 54 insertions(+), 54 deletions(-)
>

[...]

KP Singh Dec. 3, 2020, 11:02 a.m. UTC | #2

On Thu, Dec 3, 2020 at 6:46 AM Andrii Nakryiko
<[e-mail]> wrote:
>
> On Wed, Dec 2, 2020 at 4:58 PM KP Singh <[e-mail]> wrote:
> >
> > From: KP Singh <[e-mail]>
> >
>
> Commit message is missing completely.

I thought the subject is enough in this case to explain that we are
re-indenting the file.

I can explain that this was missed because checkpatch.pl did not
complain about shell
scripts and that we would like to be consistent with the other shells scripts.

>
> > Signed-off-by: KP Singh <[e-mail]>
> > ---
> >  tools/testing/selftests/bpf/ima_setup.sh | 108 +++++++++++------------
> >  1 file changed, 54 insertions(+), 54 deletions(-)
> >
>
> [...]

Alexei Starovoitov Dec. 3, 2020, 7:09 p.m. UTC | #3

On Thu, Dec 3, 2020 at 3:02 AM KP Singh <[e-mail]> wrote:
>
> On Thu, Dec 3, 2020 at 6:46 AM Andrii Nakryiko
> <[e-mail]> wrote:
> >
> > On Wed, Dec 2, 2020 at 4:58 PM KP Singh <[e-mail]> wrote:
> > >
> > > From: KP Singh <[e-mail]>
> > >
> >
> > Commit message is missing completely.
>
> I thought the subject is enough in this case to explain that we are
> re-indenting the file.

If there is nothing to add just copy paste the subject into commit log.

> I can explain that this was missed because checkpatch.pl did not
> complain about shell
> scripts and that we would like to be consistent with the other shells scripts.

checkpatch is a guidance. It's not a must have requirement.
It works both ways. Sometimes we ignore checkpatch complaints.
Sometimes we ask for things that checkpatch doesn't know about.

Please respin at your earliest convenience. CI is suffering at the moment.
It needs to be unbroken soon.

KP Singh Dec. 3, 2020, 7:17 p.m. UTC | #4

On Thu, Dec 3, 2020 at 8:10 PM Alexei Starovoitov
<[e-mail]> wrote:
>
> On Thu, Dec 3, 2020 at 3:02 AM KP Singh <[e-mail]> wrote:
> >
> > On Thu, Dec 3, 2020 at 6:46 AM Andrii Nakryiko
> > <[e-mail]> wrote:
> > >
> > > On Wed, Dec 2, 2020 at 4:58 PM KP Singh <[e-mail]> wrote:
> > > >
> > > > From: KP Singh <[e-mail]>
> > > >
> > >
> > > Commit message is missing completely.
> >
> > I thought the subject is enough in this case to explain that we are
> > re-indenting the file.
>
> If there is nothing to add just copy paste the subject into commit log.
>
> > I can explain that this was missed because checkpatch.pl did not
> > complain about shell
> > scripts and that we would like to be consistent with the other shells scripts.
>
> checkpatch is a guidance. It's not a must have requirement.
> It works both ways. Sometimes we ignore checkpatch complaints.
> Sometimes we ask for things that checkpatch doesn't know about.

Agreed, I, personally, just missed it because my editor did a weird thing
and I was relying too much on checkpatch.

>
> Please respin at your earliest convenience. CI is suffering at the moment.
> It needs to be unbroken soon.

Done. I was aware of the CI being broken :) thus this shabby work on the cover
letter and commit message (not really an excuse though).

Also, as mentioned previously, we will script and allow users to run the tests
in a CI equivalent environment so that it spares us of this pain. That's next
on my TODO list.

- KP

Patch

diff --git a/tools/testing/selftests/bpf/ima_setup.sh b/tools/testing/selftests/bpf/ima_setup.sh
index b1ee4bf06996..2bfc646bc230 100755
--- a/tools/testing/selftests/bpf/ima_setup.sh
+++ b/tools/testing/selftests/bpf/ima_setup.sh
@@ -10,90 +10,90 @@  TEST_BINARY="/bin/true"
 
 usage()
 {
-        echo "Usage: $0 <setup|cleanup|run> <existing_tmp_dir>"
-        exit 1
+	echo "Usage: $0 <setup|cleanup|run> <existing_tmp_dir>"
+	exit 1
 }
 
 ensure_mount_securityfs()
 {
-        local securityfs_dir=$(grep "securityfs" /proc/mounts | awk '{print $2}')
+	local securityfs_dir=$(grep "securityfs" /proc/mounts | awk '{print $2}')
 
-        if [ -z "${securityfs_dir}" ]; then
-                securityfs_dir=/sys/kernel/security
-                mount -t securityfs security "${securityfs_dir}"
-        fi
+	if [ -z "${securityfs_dir}" ]; then
+		securityfs_dir=/sys/kernel/security
+		mount -t securityfs security "${securityfs_dir}"
+	fi
 
-        if [ ! -d "${securityfs_dir}" ]; then
-                echo "${securityfs_dir}: securityfs is not mounted" && exit 1
-        fi
+	if [ ! -d "${securityfs_dir}" ]; then
+		echo "${securityfs_dir}: securityfs is not mounted" && exit 1
+	fi
 }
 
 setup()
 {
-        local tmp_dir="$1"
-        local mount_img="${tmp_dir}/test.img"
-        local mount_dir="${tmp_dir}/mnt"
-        local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
-        mkdir -p ${mount_dir}
+	local tmp_dir="$1"
+	local mount_img="${tmp_dir}/test.img"
+	local mount_dir="${tmp_dir}/mnt"
+	local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
+	mkdir -p ${mount_dir}
 
-        dd if=/dev/zero of="${mount_img}" bs=1M count=10
+	dd if=/dev/zero of="${mount_img}" bs=1M count=10
 
-        losetup -f "${mount_img}"
-        local loop_device=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
+	losetup -f "${mount_img}"
+	local loop_device=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
 
-        mkfs.ext2 "${loop_device:?}"
-        mount "${loop_device}" "${mount_dir}"
+	mkfs.ext2 "${loop_device:?}"
+	mount "${loop_device}" "${mount_dir}"
 
-        cp "${TEST_BINARY}" "${mount_dir}"
-        local mount_uuid="$(blkid ${loop_device} | sed 's/.*UUID="\([^"]*\)".*/\1/')"
+	cp "${TEST_BINARY}" "${mount_dir}"
+	local mount_uuid="$(blkid ${loop_device} | sed 's/.*UUID="\([^"]*\)".*/\1/')"
 
-        ensure_mount_securityfs
-        echo "measure func=BPRM_CHECK fsuuid=${mount_uuid}" > ${IMA_POLICY_FILE}
+	ensure_mount_securityfs
+	echo "measure func=BPRM_CHECK fsuuid=${mount_uuid}" > ${IMA_POLICY_FILE}
 }
 
 cleanup() {
-        local tmp_dir="$1"
-        local mount_img="${tmp_dir}/test.img"
-        local mount_dir="${tmp_dir}/mnt"
+	local tmp_dir="$1"
+	local mount_img="${tmp_dir}/test.img"
+	local mount_dir="${tmp_dir}/mnt"
 
-        local loop_devices=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
+	local loop_devices=$(losetup -a | grep ${mount_img:?} | cut -d ":" -f1)
 
-        for loop_dev in "${loop_devices}"; do
-                losetup -d $loop_dev
-        done
+	for loop_dev in "${loop_devices}"; do
+		losetup -d $loop_dev
+	done
 
-        umount ${mount_dir}
-        rm -rf ${tmp_dir}
+	umount ${mount_dir}
+	rm -rf ${tmp_dir}
 }
 
 run()
 {
-        local tmp_dir="$1"
-        local mount_dir="${tmp_dir}/mnt"
-        local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
+	local tmp_dir="$1"
+	local mount_dir="${tmp_dir}/mnt"
+	local copied_bin_path="${mount_dir}/$(basename ${TEST_BINARY})"
 
-        exec "${copied_bin_path}"
+	exec "${copied_bin_path}"
 }
 
 main()
 {
-        [[ $# -ne 2 ]] && usage
-
-        local action="$1"
-        local tmp_dir="$2"
-
-        [[ ! -d "${tmp_dir}" ]] && echo "Directory ${tmp_dir} doesn't exist" && exit 1
-
-        if [[ "${action}" == "setup" ]]; then
-                setup "${tmp_dir}"
-        elif [[ "${action}" == "cleanup" ]]; then
-                cleanup "${tmp_dir}"
-        elif [[ "${action}" == "run" ]]; then
-                run "${tmp_dir}"
-        else
-                echo "Unknown action: ${action}"
-                exit 1
-        fi
+	[[ $# -ne 2 ]] && usage
+
+	local action="$1"
+	local tmp_dir="$2"
+
+	[[ ! -d "${tmp_dir}" ]] && echo "Directory ${tmp_dir} doesn't exist" && exit 1
+
+	if [[ "${action}" == "setup" ]]; then
+		setup "${tmp_dir}"
+	elif [[ "${action}" == "cleanup" ]]; then
+		cleanup "${tmp_dir}"
+	elif [[ "${action}" == "run" ]]; then
+		run "${tmp_dir}"
+	else
+		echo "Unknown action: ${action}"
+		exit 1
+	fi
 }
 
 main "$@"