bin: generate: use POSIX sh and support spaces

Handles drivers with spaces in their names, and simplify slightly by
using globbing to unwrap the bus for loop.

It's necessary to add the final '*' in the "for driver in" loop in
bootrr-generate-template on POSIX sh.

Signed-off-by: Caleb Connolly <[email protected]>

Author: calebccff

bin/bootrr-generate-template

@@ -16,25 +16,25 @@ if [ -f /sys/devices/system/cpu/cpuidle/current_driver ]; then
 fi
 
 # Find drivers with bound devices
-for bus in $(ls /sys/bus) ; do
-	for driver in $(ls /sys/bus/${bus}/drivers) ; do
-		devs=$(find /sys/bus/${bus}/drivers/${driver} -type l |
-			grep -v module$)
-		if [ "${devs}" = "" ]; then
-			continue
-		fi
-
-		# Check for the driver
-		echo assert_driver_present ${driver}-driver-present ${driver}
-
-		# Check for each instance of the driver
-		for dev in ${devs} ; do
-			d=$(cd ${dev} ; pwd -P | sed s,.*/,,)
-			echo assert_device_present ${d}-probed ${driver} ${d}
-		done
-
-		echo
+for driver_path in /sys/bus/*/drivers/* ; do
+	devs=$(find "$driver_path" -type l -printf "\"%p\" " |
+		grep -v module$)
+	if [ "${devs}" = "" ]; then
+		continue
+	fi
+
+	driver="$(basename "$driver_path")"
+
+	# Check for the driver
+	echo assert_driver_present \"${driver}-driver-present\" \"${driver}\"
+
+	# Check for each instance of the driver
+	find "$driver_path" -type l | grep -v module$ | while read -r dev ; do
+		d=$(cd ${dev} ; pwd -P | sed s,.*/,,)
+		echo assert_device_present ${d}-probed \"${driver}\" ${d}
 	done
+
+	echo
 done
 
 # Sound card display names are symbolic links to their numbered

helpers/assert_device_present

@@ -12,7 +12,7 @@ if [ -z "${TEST_CASE_ID}" -o -z "${DRIVER}" -o -z "${DEVICE}" ]; then
 	exit 1
 fi
 
-timeout ${TIMEOUT} [ -d /sys/bus/*/drivers/${DRIVER} ] || test_report_exit blocked
-timeout ${TIMEOUT} [ -L /sys/bus/*/drivers/${DRIVER}/${DEVICE} ] || test_report_exit fail
+timeout ${TIMEOUT} [ -d /sys/bus/*/drivers/"${DRIVER}" ] || test_report_exit blocked
+timeout ${TIMEOUT} [ -L /sys/bus/*/drivers/"${DRIVER}"/"${DEVICE}" ] || test_report_exit fail
 
 test_report_exit pass

helpers/assert_driver_present

@@ -11,6 +11,6 @@ if [ -z "${TEST_CASE_ID}" -o -z "${DRIVER}" ]; then
 	exit 1
 fi
 
-timeout ${TIMEOUT} [ -d /sys/bus/*/drivers/${DRIVER} ] || test_report_exit fail
+timeout ${TIMEOUT} [ -d /sys/bus/*/drivers/"${DRIVER}" ] || test_report_exit fail
 
 test_report_exit pass

helpers/bootrr

@@ -4,7 +4,7 @@ test_report_exit() {
 	TEST_RESULT=$1
 	command -v lava-test-case
 	if [ "$?" -eq 0 ]; then
-		lava-test-case ${TEST_CASE_ID} --result ${TEST_RESULT}
+		lava-test-case "${TEST_CASE_ID}" --result ${TEST_RESULT}
 	else
 		echo "<LAVA_SIGNAL_TESTCASE TEST_CASE_ID=${TEST_CASE_ID} RESULT=${TEST_RESULT}>"
 	fi