Add kernel cmdline to kernel identifier

diff --git a/tests/_lib.sh b/tests/_lib.sh
index 987d753b6325f86434ff6d16d162ea1fe1c557ba..64620c0e732471f7fa211c795844f58cac24e0d3 100644 (file)
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -85,10 +85,24 @@ run_tests() {
     done
 }
 
+kvers() {
+    local cmdline=$(cat /proc/cmdline|sed -e 's/BOOT_IMAGE=[^ ]*//' \
+                                         -e 's/root=[^ ]*//' \
+                                         -e 's/ro//' \
+                                         -e 's/quiet//' \
+                                         -e 's/rootfstype=[^ ]*//' \
+                                         -e 's/elevator=[^ ]*//' \
+                                         -e 's/^ *//' \
+                                         -e 's/ *$//'|tr -s ' ' '_')
+    v=$(uname -r)
+    [ -n "$cmdline" ] && v="$v:$cmdline"
+    echo $v
+}
+
 plot() {
     for i in "${!PLOT_CMD[@]}"; do
        cmd="${PLOT_CMD[$i]}";
-       cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/'\1 ($(uname -r), CPU\\\\@${clk}Mhz)'/")
+       cmd=$(echo "$cmd" | sed -e "/set title/ s/[\"']\(.*\)[\"']/'\1 ($(kvers), CPU\\\\@${clk}Mhz)'/")
        if [ -z "$OPT_NO_X11" ]; then
            echo "set terminal x11 enhanced; ${cmd}" | gnuplot -persist
        fi
@@ -131,7 +145,7 @@ go() {
     fi
     for clk in $mhz; do
     echo "===================="
-       dir=$(create_dirs_and_links `basename $0 .sh` `uname -r` $clk)
+       dir=$(create_dirs_and_links `basename $0 .sh` `kvers` $clk)
        set -x
        pushd $dir