[PATCH 3/5] testsuite: pass -F to depmod when passing -e

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

depmod -e without -E or -F will print a warning and have no effect.

Signed-off-by: Keegan McAllister <keegan@xxxxxxxxxxx>
---
 tests/test-depmod/02simple.sh           |   16 +++++++++-------
 tests/test-depmod/04maps.sh             |    8 +++++---
 tests/test-depmod/06undefined.sh        |    2 +-
 tests/test-depmod/07complex.sh          |    8 +++++---
 tests/test-depmod/08basedir.sh          |   12 +++++++-----
 tests/test-depmod/12compressed.sh       |   16 +++++++++-------
 tests/test-depmod/13compressed-maps.sh  |    8 +++++---
 tests/test-depmod/14updates.sh          |   16 +++++++++-------
 tests/test-depmod/15symlink.sh          |   16 +++++++++-------
 tests/test-depmod/16specific-modules.sh |   12 +++++++-----
 10 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/tests/test-depmod/02simple.sh b/tests/test-depmod/02simple.sh
index 718e058..e73511b 100755
--- a/tests/test-depmod/02simple.sh
+++ b/tests/test-depmod/02simple.sh
@@ -38,6 +38,8 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
+touch tests/tmp/empty
+
 # Synonyms
 [ "`depmod $MODTEST_UNAME`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
@@ -69,13 +71,13 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -93,25 +95,25 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick`" = "" ]
+[ "`depmod -e -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick`" = "" ]
+[ "`depmod --errsyms -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod --errsyms -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -133,7 +135,7 @@ depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -e -n -F /empty -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
diff --git a/tests/test-depmod/04maps.sh b/tests/test-depmod/04maps.sh
index 8d30f8f..c676c1b 100755
--- a/tests/test-depmod/04maps.sh
+++ b/tests/test-depmod/04maps.sh
@@ -19,6 +19,8 @@ ln tests/data/$BITNESS$ENDIAN/map/ccw_map-$BITNESS.ko \
    tests/data/$BITNESS$ENDIAN/map/input_map_new-$BITNESS.ko \
    $MODULE_DIR
 
+touch tests/tmp/empty
+
 # Expect no output.
 [ "`depmod`" = "" ]
 
@@ -119,7 +121,7 @@ diff -u $MODULE_DIR/modules.isapnpmap.old $MODULE_DIR/modules.isapnpmap
 diff -u $MODULE_DIR/modules.inputmap.old $MODULE_DIR/modules.inputmap
 diff -u $MODULE_DIR/modules.ofmap.old $MODULE_DIR/modules.ofmap
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 diff -u $MODULE_DIR/modules.pcimap.old $MODULE_DIR/modules.pcimap
 diff -u $MODULE_DIR/modules.usbmap.old $MODULE_DIR/modules.usbmap
@@ -129,7 +131,7 @@ diff -u $MODULE_DIR/modules.isapnpmap.old $MODULE_DIR/modules.isapnpmap
 diff -u $MODULE_DIR/modules.inputmap.old $MODULE_DIR/modules.inputmap
 diff -u $MODULE_DIR/modules.ofmap.old $MODULE_DIR/modules.ofmap
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 diff -u $MODULE_DIR/modules.pcimap.old $MODULE_DIR/modules.pcimap
 diff -u $MODULE_DIR/modules.usbmap.old $MODULE_DIR/modules.usbmap
@@ -152,7 +154,7 @@ diff -u tests/tmp/out tests/tmp/stdout
 depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
 diff -u tests/tmp/out tests/tmp/stdout
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
+depmod -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
 diff -u tests/tmp/out tests/tmp/stdout
 
 done
diff --git a/tests/test-depmod/06undefined.sh b/tests/test-depmod/06undefined.sh
index 666358d..df08074 100755
--- a/tests/test-depmod/06undefined.sh
+++ b/tests/test-depmod/06undefined.sh
@@ -18,7 +18,7 @@ touch tests/tmp/empty
 [ "`depmod -F /empty 2>&1`" = "" ]
 
 # Without -F doesn't matter
-[ "`depmod -e 2>&1`" = "" ]
+[ "`depmod -e 2>&1`" = "WARNING: -e needs -E or -F" ]
 
 [ "`depmod -e -F /empty 2>&1`" = "WARNING: /lib/modules/$MODTEST_UNAME/unknown-$BITNESS.ko needs unknown symbol undefined" ]
 
diff --git a/tests/test-depmod/07complex.sh b/tests/test-depmod/07complex.sh
index aee0921..e22218e 100755
--- a/tests/test-depmod/07complex.sh
+++ b/tests/test-depmod/07complex.sh
@@ -22,6 +22,8 @@ ln tests/data/$BITNESS$ENDIAN/complex/complex_a-$BITNESS.ko \
    tests/data/$BITNESS$ENDIAN/complex/complex_e-$BITNESS.ko \
    $MODULE_DIR
 
+touch tests/tmp/empty
+
 # Expect no output.
 [ "`depmod 2>&1`" = "" ]
 
@@ -51,11 +53,11 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
@@ -75,7 +77,7 @@ depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
diff --git a/tests/test-depmod/08basedir.sh b/tests/test-depmod/08basedir.sh
index b013d3b..9b5c427 100755
--- a/tests/test-depmod/08basedir.sh
+++ b/tests/test-depmod/08basedir.sh
@@ -16,6 +16,8 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
    tests/data/$BITNESS$ENDIAN/normal/noexport_doubledep-$BITNESS.ko \
    $MODULE_DIR
 
+touch tests/tmp/empty
+
 # Expect no output.
 [ "`depmod -b /BASEDIR 2>&1`" = "" ]
 
@@ -39,19 +41,19 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
-[ "`depmod -b /BASEDIR -e -A`" = "" ]
+[ "`depmod -b /BASEDIR -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
-[ "`depmod -b /BASEDIR -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -b /BASEDIR -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
-[ "`depmod --basedir /BASEDIR -e -A $MODTEST_VERSION 2>&1`" = "" ]
+[ "`depmod --basedir /BASEDIR -e -F /empty -A $MODTEST_VERSION 2>&1`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
-[ "`depmod --basedir=/BASEDIR -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod --basedir=/BASEDIR -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 
@@ -71,7 +73,7 @@ depmod -b /BASEDIR -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.a
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -b /BASEDIR -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -b /BASEDIR -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
diff --git a/tests/test-depmod/12compressed.sh b/tests/test-depmod/12compressed.sh
index 696fd73..5e65673 100755
--- a/tests/test-depmod/12compressed.sh
+++ b/tests/test-depmod/12compressed.sh
@@ -19,6 +19,8 @@ cp tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
    $MODULE_DIR
 gzip `find $MODULE_DIR -name '*.ko'`
 
+touch tests/tmp/empty
+
 # First time, there is no modules.dep, so it will be generated.
 # Expect no output.
 [ "`depmod -A 2>&1`" = "" ]
@@ -73,13 +75,13 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -97,25 +99,25 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick`" = "" ]
+[ "`depmod -e -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick`" = "" ]
+[ "`depmod --errsyms -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod --errsyms -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -137,7 +139,7 @@ depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
diff --git a/tests/test-depmod/13compressed-maps.sh b/tests/test-depmod/13compressed-maps.sh
index 5f2a077..0a991ac 100755
--- a/tests/test-depmod/13compressed-maps.sh
+++ b/tests/test-depmod/13compressed-maps.sh
@@ -30,6 +30,8 @@ cp tests/data/$BITNESS$ENDIAN/map/ccw_map-$BITNESS.ko \
    $MODULE_DIR
 gzip `find $MODULE_DIR -name '*.ko'`
 
+touch tests/tmp/empty
+
 # Expect no output.
 [ "`depmod`" = "" ]
 
@@ -114,7 +116,7 @@ diff -u $MODULE_DIR/modules.isapnpmap.old $MODULE_DIR/modules.isapnpmap
 diff -u $MODULE_DIR/modules.inputmap.old $MODULE_DIR/modules.inputmap
 diff -u $MODULE_DIR/modules.ofmap.old $MODULE_DIR/modules.ofmap
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 diff -u $MODULE_DIR/modules.pcimap.old $MODULE_DIR/modules.pcimap
 diff -u $MODULE_DIR/modules.usbmap.old $MODULE_DIR/modules.usbmap
@@ -124,7 +126,7 @@ diff -u $MODULE_DIR/modules.isapnpmap.old $MODULE_DIR/modules.isapnpmap
 diff -u $MODULE_DIR/modules.inputmap.old $MODULE_DIR/modules.inputmap
 diff -u $MODULE_DIR/modules.ofmap.old $MODULE_DIR/modules.ofmap
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
 diff -u $MODULE_DIR/modules.pcimap.old $MODULE_DIR/modules.pcimap
 diff -u $MODULE_DIR/modules.usbmap.old $MODULE_DIR/modules.usbmap
@@ -147,7 +149,7 @@ diff -u tests/tmp/out tests/tmp/stdout
 depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
 diff -u tests/tmp/out tests/tmp/stdout
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
+depmod -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
 diff -u tests/tmp/out tests/tmp/stdout
 
 done
diff --git a/tests/test-depmod/14updates.sh b/tests/test-depmod/14updates.sh
index f42bf77..7bb2418 100755
--- a/tests/test-depmod/14updates.sh
+++ b/tests/test-depmod/14updates.sh
@@ -21,6 +21,8 @@ mkdir -p $MODULE_DIR/updates
 ln tests/data/$BITNESS$ENDIAN/normal/export_nodep-$BITNESS.ko \
    $MODULE_DIR/updates
 
+touch tests/tmp/empty
+
 # First we try update which overrides, then not
 for iter in override not-override; do
 
@@ -78,13 +80,13 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -102,25 +104,25 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick`" = "" ]
+[ "`depmod -e -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick`" = "" ]
+[ "`depmod --errsyms -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod --errsyms -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -142,7 +144,7 @@ depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
diff --git a/tests/test-depmod/15symlink.sh b/tests/test-depmod/15symlink.sh
index 968f4fd..823c689 100755
--- a/tests/test-depmod/15symlink.sh
+++ b/tests/test-depmod/15symlink.sh
@@ -26,6 +26,8 @@ mkdir tests/tmp/updates
 ln -s ../../../updates $MODULE_DIR/updates
 ln tests/data/$BITNESS$ENDIAN/rename/rename-new-$BITNESS.ko tests/tmp/updates
 
+touch tests/tmp/empty
+
 # Expect no output.
 [ "`depmod 2>&1`" = "" ]
 
@@ -80,13 +82,13 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A`" = "" ]
+[ "`depmod -e -F /empty -A`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e -A $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty -A $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -104,25 +106,25 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick`" = "" ]
+[ "`depmod -e -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod -e -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick`" = "" ]
+[ "`depmod --errsyms -F /empty --quick`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms --quick $MODTEST_VERSION`" = "" ]
+[ "`depmod --errsyms -F /empty --quick $MODTEST_VERSION`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -144,7 +146,7 @@ depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -e -F /empty -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
diff --git a/tests/test-depmod/16specific-modules.sh b/tests/test-depmod/16specific-modules.sh
index 13647ff..5fef281 100755
--- a/tests/test-depmod/16specific-modules.sh
+++ b/tests/test-depmod/16specific-modules.sh
@@ -16,6 +16,8 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
    tests/data/$BITNESS$ENDIAN/normal/noexport_doubledep-$BITNESS.ko \
    $MODULE_DIR
 
+touch tests/tmp/empty
+
 ALL="/lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko"
 
 # Expect no output.
@@ -47,25 +49,25 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e $ALL`" = "" ]
+[ "`depmod -e -F /empty $ALL`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod -e $MODTEST_VERSION $ALL`" = "" ]
+[ "`depmod -e -F /empty $MODTEST_VERSION $ALL`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms $ALL`" = "" ]
+[ "`depmod --errsyms -F /empty $ALL`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
 mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
 
-[ "`depmod --errsyms $MODTEST_VERSION $ALL`" = "" ]
+[ "`depmod --errsyms -F /empty $MODTEST_VERSION $ALL`" = "" ]
 diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep >/dev/null
 mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
 diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols >/dev/null
@@ -83,7 +85,7 @@ depmod -n $MODTEST_VERSION $ALL | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-depmod -e -n $MODTEST_VERSION $ALL | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -e -F /empty -n $MODTEST_VERSION $ALL | grep -v '^#' > $MODULE_DIR/modules.all
 diff -u $MODULE_DIR/modules.all.old $MODULE_DIR/modules.all >/dev/null
 mv $MODULE_DIR/modules.all $MODULE_DIR/modules.all.old
 
-- 
1.7.2.3

--
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
[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux