From 7cbefe7a328686cefa0267f4739fd38f2dd50995 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 19 Nov 2024 08:48:48 -0600 Subject: [PATCH] testsuite: Remove duplicated directory module-param-kcmdline7 was incorrectly copied inside module-param-kcmdline{7,8}. Drop the extra dir that is not used anywhere. Fixes: d3a1fe67b64c ("libkmod-config: re-quote option from kernel cmdline") Signed-off-by: Lucas De Marchi Reviewed-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/254 --- .../module-param-kcmdline7/correct.txt | 5 ----- .../module-param-kcmdline7/proc/cmdline | 1 - .../module-param-kcmdline7/correct.txt | 5 ----- .../module-param-kcmdline7/proc/cmdline | 1 - 4 files changed, 12 deletions(-) delete mode 100644 testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/correct.txt delete mode 100644 testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/proc/cmdline delete mode 100644 testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/correct.txt delete mode 100644 testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/proc/cmdline diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/correct.txt b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/correct.txt deleted file mode 100644 index d80da6d8..00000000 --- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/correct.txt +++ /dev/null @@ -1,5 +0,0 @@ -options psmouse foo -options parport dyndbg="file drivers/parport/ieee1284_ops.c +mpf" - -# End of configuration files. Dumping indexes now: - diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/proc/cmdline b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/proc/cmdline deleted file mode 100644 index 86f90523..00000000 --- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline7/module-param-kcmdline7/proc/cmdline +++ /dev/null @@ -1 +0,0 @@ -psmouse.foo parport.dyndbg="file drivers/parport/ieee1284_ops.c +mpf" quiet rw diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/correct.txt b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/correct.txt deleted file mode 100644 index d80da6d8..00000000 --- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/correct.txt +++ /dev/null @@ -1,5 +0,0 @@ -options psmouse foo -options parport dyndbg="file drivers/parport/ieee1284_ops.c +mpf" - -# End of configuration files. Dumping indexes now: - diff --git a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/proc/cmdline b/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/proc/cmdline deleted file mode 100644 index 86f90523..00000000 --- a/testsuite/rootfs-pristine/test-modprobe/module-param-kcmdline8/module-param-kcmdline7/proc/cmdline +++ /dev/null @@ -1 +0,0 @@ -psmouse.foo parport.dyndbg="file drivers/parport/ieee1284_ops.c +mpf" quiet rw -- 2.47.2