Skip to contentSkip to conversation

selftests/kselftest/runner/run_one(): Allow running non-executable files

PATCH Superseded SeongJae Park 2 participants 3 messages Aug 10, 2021 Kselftest

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/kselftest/runner/run_one(): Allow running non-executable files

From: SeongJae Park <[email protected]>

When running a test program, 'run_one()' checks if the program has the execution permission and fails if it doesn't. However, it's easy to mistakenly missing the permission, as some common tools like 'diff' don't support the permission change well[1]. Compared to that, making mistakes in the test program's path would only rare, as those are explicitly listed in 'TEST_PROGS'. Therefore, it might make more sense to resolve the situation on our own and run the program.

For the reason, this commit makes the test program runner function to still print the warning message but run the program after giving the execution permission in the case. To make nothing corrupted, it also restores the permission after running it.

[1] https://lore.kernel.org/mm-commits/[email protected]/

---
 tools/testing/selftests/kselftest/runner.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
tools/testing/selftests/kselftest/runner.sh +11 -7
index cc9c846585f0..2eb31e945709 100644
@@ -65,15 +65,16 @@ run_one()
 
 	TEST_HDR_MSG="selftests: $DIR: $BASENAME_TEST"
 	echo "# $TEST_HDR_MSG"
-	if [ ! -x "$TEST" ]; then
-		echo -n "# Warning: file $TEST is "
-		if [ ! -e "$TEST" ]; then
-			echo "missing!"
-		else
-			echo "not executable, correct this."
-		fi
+	if [ ! -e "$TEST" ]; then
+		echo "# Warning: file $TEST is missing!"
 		echo "not ok $test_num $TEST_HDR_MSG"
 	else
+		permission_added="false"
+		if [ ! -x "$TEST" ]; then
+			echo "# Warning: file $TEST is not executable"
+			chmod u+x "$TEST"
+			permission_added="true"
+		fi
 		cd `dirname $TEST` > /dev/null
 		((((( tap_timeout ./$BASENAME_TEST 2>&1; echo $? >&3) |
 			tap_prefix >&4) 3>&1) |
@@ -88,6 +89,9 @@ run_one()
 		else
 			echo "not ok $test_num $TEST_HDR_MSG # exit=$rc"
 		fi)
+		if [ "$permission_added" = "true" ]; then
+			chmod u-x "$TEST"
+		fi
 		cd - >/dev/null
 	fi
 }
Signature · 1 line
2.17.1
#1 lore raw
Quoted 37 lines · SeongJae Park

From: SeongJae Park <[email protected]>

When running a test program, 'run_one()' checks if the program has the execution permission and fails if it doesn't. However, it's easy to mistakenly missing the permission, as some common tools like 'diff' don't support the permission change well[1]. Compared to that, making mistakes in the test program's path would only rare, as those are explicitly listed in 'TEST_PROGS'. Therefore, it might make more sense to resolve the situation on our own and run the program.

For the reason, this commit makes the test program runner function to still print the warning message but run the program after giving the execution permission in the case. To make nothing corrupted, it also restores the permission after running it.

[1] https://lore.kernel.org/mm-commits/[email protected]/

---
 tools/testing/selftests/kselftest/runner.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
tools/testing/selftests/kselftest/runner.sh +0 -6
index cc9c846585f0..2eb31e945709 100644
@@ -65,15 +65,16 @@ run_one()
 
 	TEST_HDR_MSG="selftests: $DIR: $BASENAME_TEST"
 	echo "# $TEST_HDR_MSG"
-	if [ ! -x "$TEST" ]; then
-		echo -n "# Warning: file $TEST is "
-		if [ ! -e "$TEST" ]; then
-			echo "missing!"
-		else
-			echo "not executable, correct this."

tools/testing/selftests/kselftest/runner.sh run_one() · line 76

Quoted 10 lines
tools/testing/selftests/kselftest/runner.sh +7 -1
-		fi
+	if [ ! -e "$TEST" ]; then
+		echo "# Warning: file $TEST is missing!"
 		echo "not ok $test_num $TEST_HDR_MSG"
 	else
+		permission_added="false"
+		if [ ! -x "$TEST" ]; then
+			echo "# Warning: file $TEST is not executable"
+			chmod u+x "$TEST"
+			permission_added="true"

No, why would you change the permission of a test? What happens if this is on a read-only filesystem? You should not be modifying it as it will end up causing changes when not needed.

thanks,

greg k-h

#2 lore raw

From: SeongJae Park <[email protected]>

Quoted 44 lines · On Tue, 10 Aug 2021 17:07:28 +0200 Greg KH <[email protected]> wrote:
Quoted 43 lines · SeongJae Park

From: SeongJae Park <[email protected]>

When running a test program, 'run_one()' checks if the program has the execution permission and fails if it doesn't. However, it's easy to mistakenly missing the permission, as some common tools like 'diff' don't support the permission change well[1]. Compared to that, making mistakes in the test program's path would only rare, as those are explicitly listed in 'TEST_PROGS'. Therefore, it might make more sense to resolve the situation on our own and run the program.

For the reason, this commit makes the test program runner function to still print the warning message but run the program after giving the execution permission in the case. To make nothing corrupted, it also restores the permission after running it.

[1] https://lore.kernel.org/mm-commits/[email protected]/

---
 tools/testing/selftests/kselftest/runner.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
tools/testing/selftests/kselftest/runner.sh +3 -7
index cc9c846585f0..2eb31e945709 100644
@@ -65,15 +65,16 @@ run_one()
 
 	TEST_HDR_MSG="selftests: $DIR: $BASENAME_TEST"
 	echo "# $TEST_HDR_MSG"
-	if [ ! -x "$TEST" ]; then
-		echo -n "# Warning: file $TEST is "
-		if [ ! -e "$TEST" ]; then
-			echo "missing!"
-		else
-			echo "not executable, correct this."
-		fi
+	if [ ! -e "$TEST" ]; then
+		echo "# Warning: file $TEST is missing!"
 		echo "not ok $test_num $TEST_HDR_MSG"
 	else
+		permission_added="false"
Quoted 8 lines

tools/testing/selftests/kselftest/runner.sh run_one() · line 76

Quoted 4 lines
tools/testing/selftests/kselftest/runner.sh +4 -0
+		if [ ! -x "$TEST" ]; then
+			echo "# Warning: file $TEST is not executable"
+			chmod u+x "$TEST"
+			permission_added="true"

No, why would you change the permission of a test? What happens if this is on a read-only filesystem? You should not be modifying it as it will end up causing changes when not needed.

Agreed. I will parse the shebang line and use the interpreter explicitly in the next spin.

Thanks,
SeongJae Park

Quoted 4 lines

thanks,

greg k-h