generate-modprobe.conf has been touched recently, and the testsuite has
been refreshed a couple of times. But generate-modprobe.conf is of
limited interest, and no-one has tried to re-enable, fix, or update
these tests.
Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>
diff --git a/tests/test-generate-modprobe.conf/disabled01above.sh b/tests/test-generate-modprobe.conf/disabled01above.sh
deleted file mode 100755
index 97e3281..0000000
--- a/tests/test-generate-modprobe.conf/disabled01above.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# Test conversion of "above" command.
-
-# Single arg.
-echo 'above scsi_mod ide-scsi' > tests/tmp/modules.conf
-
-TESTING_MODPROBE_CONF=tests/tmp/modules.conf
-export TESTING_MODPROBE_CONF
-
-[ "`./generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-
-#[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install scsi_mod /sbin/modprobe --first-time --ignore-install scsi_mod && { /sbin/modprobe ide-scsi; /bin/true; }" ]
-
-[ "`grep ^remove tests/tmp/modprobe.conf`" = "remove scsi_mod { /sbin/modprobe -r ide-scsi; } ; /sbin/modprobe -r --first-time --ignore-remove scsi_mod" ]
-
-# Multiple arg.
-echo 'above mod a b c' > tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install mod /sbin/modprobe --first-time --ignore-install mod && { /sbin/modprobe a; /sbin/modprobe b; /sbin/modprobe c; /bin/true; }" ]
-
-[ "`grep ^remove tests/tmp/modprobe.conf`" = "remove mod { /sbin/modprobe -r a; /sbin/modprobe -r b; /sbin/modprobe -r c; } ; /sbin/modprobe -r --first-time --ignore-remove mod" ]
-
-# This matches with test-modprobe/22recursiveinstall.sh
-echo 'add above ip_conntrack ip_conntrack_ftp' > tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install ip_conntrack /sbin/modprobe --first-time --ignore-install ip_conntrack && { /sbin/modprobe ip_conntrack_ftp; /bin/true; }" ]
-
diff --git a/tests/test-generate-modprobe.conf/disabled02options.sh b/tests/test-generate-modprobe.conf/disabled02options.sh
deleted file mode 100755
index 9f098d6..0000000
--- a/tests/test-generate-modprobe.conf/disabled02options.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Test conversion of "options" command.
-
-# Simple.
-echo 'options dummy0 dummy0-options' > tests/tmp/modules.conf
-
-TESTING_MODPROBE_CONF=tests/tmp/modules.conf
-export TESTING_MODPROBE_CONF
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 1 ]
-[ "`grep ^options tests/tmp/modprobe.conf`" = "options dummy0 dummy0-options" ]
-
-# Command line args.
-echo 'options dummy0 -o dummy0' > tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 1 ]
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy0" ]
-
-# Both
-echo 'options dummy0 -o dummy0 dummy0-options' > tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy0" ]
-[ "`grep ^options tests/tmp/modprobe.conf`" = "options dummy0 dummy0-options" ]
-
-echo 'options dummy0 dummy0-options -o dummy0' > tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy0" ]
-[ "`grep ^options tests/tmp/modprobe.conf`" = "options dummy0 dummy0-options" ]
diff --git a/tests/test-generate-modprobe.conf/disabled03alias.sh b/tests/test-generate-modprobe.conf/disabled03alias.sh
deleted file mode 100755
index 3cdf6c7..0000000
--- a/tests/test-generate-modprobe.conf/disabled03alias.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Test conversion of "alias" command.
-
-TESTING_MODPROBE_CONF=tests/tmp/modules.conf
-export TESTING_MODPROBE_CONF
-
-# Simple.
-echo 'alias dummy0 dummy' > tests/tmp/modules.conf
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 1 ]
-[ "`grep ^alias tests/tmp/modprobe.conf`" = "alias dummy0 dummy" ]
-
-# Recursive
-echo 'alias dummy0 dummy' > tests/tmp/modules.conf
-echo 'alias dummy0-alias dummy0' >> tests/tmp/modules.conf
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-[ "`grep ^alias tests/tmp/modprobe.conf`" = "alias dummy0 dummy
-alias dummy0-alias dummy" ]
-
-# Chasing options (FIXME: FAILS)
-#echo 'options dummy0-alias dummy0-alias-options' >> tests/tmp/modules.conf
-#echo 'options dummy0 dummy0-options' >> tests/tmp/modules.conf
-#[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-#[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 4 ]
-#[ "`grep ^alias tests/tmp/modprobe.conf`" = "alias dummy0 dummy
-#alias dummy0-alias dummy" ]
-#[ "`grep '^options dummy0 ' tests/tmp/modprobe.conf`" = "options dummy0 dummy0-options" ]
-#[ "`grep '^options dummy0-alias ' tests/tmp/modprobe.conf`" = "options dummy0-alias dummy0-options dummy0-alias-options" ]
diff --git a/tests/test-generate-modprobe.conf/disabled04blockalias.sh b/tests/test-generate-modprobe.conf/disabled04blockalias.sh
deleted file mode 100755
index e422e31..0000000
--- a/tests/test-generate-modprobe.conf/disabled04blockalias.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-# Test conversion of "alias" command when they are block or char majors.
-# (now they need a wildcard for the minor).
-
-TESTING_MODPROBE_CONF=tests/tmp/modules.conf
-export TESTING_MODPROBE_CONF
-
-echo 'alias char-major-17 a' > tests/tmp/modules.conf
-echo 'alias block-major-12 b' >> tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-[ "`grep ^alias tests/tmp/modprobe.conf`" = "alias char-major-17-* a
-alias block-major-12-* b" ]
-
-# Recursive
-echo 'alias char-major-17 a-alias' > tests/tmp/modules.conf
-echo 'alias a-alias a' >> tests/tmp/modules.conf
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 2 ]
-[ "`grep ^alias tests/tmp/modprobe.conf`" = "alias char-major-17-* a
-alias a-alias a" ]
diff --git a/tests/test-generate-modprobe.conf/disabled05off.sh b/tests/test-generate-modprobe.conf/disabled05off.sh
deleted file mode 100755
index fbf62a3..0000000
--- a/tests/test-generate-modprobe.conf/disabled05off.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-# Test conversion of "alias" command when they are for off or null.
-
-TESTING_MODPROBE_CONF=tests/tmp/modules.conf
-export TESTING_MODPROBE_CONF
-
-echo 'alias net-pf-1 off' > tests/tmp/modules.conf
-echo 'alias net-pf-2 null' >> tests/tmp/modules.conf
-echo 'add alias net-pf-3 off' >> tests/tmp/modules.conf
-echo 'add alias net-pf-4 null' >> tests/tmp/modules.conf
-
-[ "`generate-modprobe.conf > tests/tmp/modprobe.conf 2>&1`" = "" ]
-[ `grep -v '^#' < tests/tmp/modprobe.conf | wc -l` = 4 ]
-[ "`grep ^install tests/tmp/modprobe.conf`" = "install net-pf-1 /bin/true
-install net-pf-2 /bin/true
-install net-pf-3 /bin/true
-install net-pf-4 /bin/true" ]
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
