ktest.pl: Add shell commands to variables

Allow variables to execute shell commands. Note, these are processed when
they are first seen while parsing the config file. This is useful if you
have the same config file used for multiple hosts (as they may be in a git
repository).

 HOSTNAME := ${shell hostname}
 DEFAULTS IF "${HOSTNAME}" == "frodo"

Link: https://lkml.kernel.org/r/20221207212944.277ee850@gandalf.local.home
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 1737c59e4ff674521351d95b121806ae0939fcba..ac59999ed3ded81131f1f1c0911cf0acce7c989c 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -802,7 +802,14 @@ sub process_variables {
        my $end = $3;
        # append beginning of value to retval
        $retval = "$retval$begin";
-       if (defined($variable{$var})) {
+       if ($var =~ s/^shell\s+//) {
+           $retval = `$var`;
+           if ($?) {
+               doprint "WARNING: $var returned an error\n";
+           } else {
+               chomp $retval;
+           }
+       } elsif (defined($variable{$var})) {
            $retval = "$retval$variable{$var}";
        } elsif (defined($remove_undef) && $remove_undef) {
            # for if statements, any variable that is not defined,

diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 5e7d1d7297529be4ca1b684af3bd5b3e87b1fcfc..2d0fe15a096dd36a5384d98d09fa0d467fcd8cb3 100644 (file)
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -259,6 +259,14 @@
 # If PATH is not a config variable, then the ${PATH} in
 # the MAKE_CMD option will be evaluated by the shell when
 # the MAKE_CMD option is passed into shell processing.
+#
+# Shell commands can also be inserted with the ${shell <command>}
+# expression. Note, this is case sensitive, thus ${SHELL <command>}
+# will not work.
+#
+# HOSTNAME := ${shell hostname}
+# DEFAULTS IF "${HOSTNAME}" == "frodo"
+#
 
 #### Using options in other options ####
 #