[PATCH 3/4] testsuite: use PATH

[Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>]

In the tests, replace e.g.
   ./modprobe
with
   modprobe
and make sure that PATH includes ".".

This will make it possible to move modprobe and friends around, by
simply changing PATH.

Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>
diff --git a/tests/runtests b/tests/runtests
index b0b6dce..7de23a3 100755
--- a/tests/runtests
+++ b/tests/runtests
@@ -66,12 +66,7 @@ for config in --enable-zlib --disable-zlib; do
    ln -sfn 64-$ENDIAN tests/data/64
    ln -sfn 32-$ENDIAN tests/data/32

-    # Make them run the valgrind wrappers, if available.
-    if type valgrind 2>/dev/null; then
-	PATH=`pwd`/tests:$PATH
-    else
-	PATH=`pwd`:$PATH
-    fi
+    PATH=`pwd`:$PATH

    # By default, we want to look like a new kernel.
    MODTEST_UNAME=2.6.27
diff --git a/tests/test-depmod/02simple.sh b/tests/test-depmod/02simple.sh
index 4165db3..d043351 100755
--- a/tests/test-depmod/02simple.sh
+++ b/tests/test-depmod/02simple.sh
@@ -17,7 +17,7 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
   $MODULE_DIR

# Expect no output.
-[ "`./depmod 2>&1`" = "" ]
+[ "`depmod 2>&1`" = "" ]

# Check modules.dep results: expect 5 lines
[ "`grep -vc '^#' < $MODULE_DIR/modules.dep`" = "5" ]
@@ -39,79 +39,79 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

# Synonyms
-[ "`./depmod $MODTEST_UNAME`" = "" ]
+[ "`depmod $MODTEST_UNAME`" = "" ]
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 -a`" = "" ]
+[ "`depmod -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 -a $MODTEST_UNAME`" = "" ]
+[ "`depmod -a $MODTEST_UNAME`" = "" ]
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 -A`" = "" ]
+[ "`depmod -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 -A $MODTEST_UNAME`" = "" ]
+[ "`depmod -A $MODTEST_UNAME`" = "" ]
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`" = "" ]
+[ "`depmod -e -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 -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
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

-[ "`./depmod --all`" = "" ]
+[ "`depmod --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 --quick`" = "" ]
+[ "`depmod --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`" = "" ]
+[ "`depmod -e --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 --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 --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 --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
@@ -121,19 +121,19 @@ mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols.old > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -n | 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 -a -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -a -n | 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 -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+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 -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 4439952..ef7cf52 100755
--- a/tests/test-depmod/04maps.sh
+++ b/tests/test-depmod/04maps.sh
@@ -20,7 +20,7 @@ ln tests/data/$BITNESS$ENDIAN/map/ccw_map-$BITNESS.ko \
   $MODULE_DIR

# Expect no output.
-[ "`./depmod`" = "" ]
+[ "`depmod`" = "" ]

# Check PCI: expect 2 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.pcimap` = 2 ]
@@ -99,7 +99,7 @@ mv $MODULE_DIR/modules.inputmap $MODULE_DIR/modules.inputmap.old
mv $MODULE_DIR/modules.ofmap $MODULE_DIR/modules.ofmap.old

# Synonyms
-[ "`./depmod -a`" = "" ]
+[ "`depmod -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
@@ -109,7 +109,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 -A`" = "" ]
+[ "`depmod -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
@@ -119,7 +119,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 -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 +129,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 -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
@@ -143,16 +143,16 @@ diff -u $MODULE_DIR/modules.ofmap.old $MODULE_DIR/modules.ofmap
grep -hv '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.pcimap.old $MODULE_DIR/modules.usbmap.old $MODULE_DIR/modules.ccwmap.old $MODULE_DIR/modules.ieee1394map.old $MODULE_DIR/modules.isapnpmap.old $MODULE_DIR/modules.inputmap.old $MODULE_DIR/modules.ofmap.old > tests/tmp/out

# Stdout versions.
-./depmod -n | grep -v '^#' > tests/tmp/stdout
+depmod -n | grep -v '^#' > tests/tmp/stdout
diff -u tests/tmp/out tests/tmp/stdout

-./depmod -a -n | grep -v '^#' > $MODULE_DIR/modules.dep
+depmod -a -n | grep -v '^#' > $MODULE_DIR/modules.dep
diff -u tests/tmp/out tests/tmp/stdout

-./depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
+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 -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/05loop.sh b/tests/test-depmod/05loop.sh
index c577d39..aefd13d 100755
--- a/tests/test-depmod/05loop.sh
+++ b/tests/test-depmod/05loop.sh
@@ -15,7 +15,7 @@ ln tests/data/$BITNESS$ENDIAN/loop/loop1-$BITNESS.ko \
   $MODULE_DIR

# Expect no normal output.
-[ "`./depmod 2>tests/tmp/stderr`" = "" ]
+[ "`depmod 2>tests/tmp/stderr`" = "" ]

# Check results: expect 0 lines (all have loops).
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 0 ]
diff --git a/tests/test-depmod/06undefined.sh b/tests/test-depmod/06undefined.sh
index 2261e35..171e8cd 100755
--- a/tests/test-depmod/06undefined.sh
+++ b/tests/test-depmod/06undefined.sh
@@ -15,12 +15,12 @@ ln tests/data/$BITNESS$ENDIAN/unknown/unknown-$BITNESS.ko \
touch tests/tmp/empty

# Without -e, doesn't matter.
-[ "`./depmod -F /empty 2>&1`" = "" ]
+[ "`depmod -F /empty 2>&1`" = "" ]

# Without -F doesn't matter
-[ "`./depmod -e 2>&1`" = "" ]
+[ "`depmod -e 2>&1`" = "" ]

-[ "`./depmod -e -F /empty 2>&1`" = "WARNING: /lib/modules/$MODTEST_UNAME/unknown-$BITNESS.ko needs unknown symbol undefined" ]
+[ "`depmod -e -F /empty 2>&1`" = "WARNING: /lib/modules/$MODTEST_UNAME/unknown-$BITNESS.ko needs unknown symbol undefined" ]

done
done
diff --git a/tests/test-depmod/07complex.sh b/tests/test-depmod/07complex.sh
index e79a276..2332229 100755
--- a/tests/test-depmod/07complex.sh
+++ b/tests/test-depmod/07complex.sh
@@ -23,7 +23,7 @@ ln tests/data/$BITNESS$ENDIAN/complex/complex_a-$BITNESS.ko \
   $MODULE_DIR

# Expect no output.
-[ "`./depmod 2>&1`" = "" ]
+[ "`depmod 2>&1`" = "" ]

# Check results: expect 5 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 5 ]
@@ -43,19 +43,19 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

# Synonyms
-[ "`./depmod -a`" = "" ]
+[ "`depmod -a`" = "" ]
diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old

-[ "`./depmod -A`" = "" ]
+[ "`depmod -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`" = "" ]
+[ "`depmod -e -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 -A $MODTEST_VERSION`" = "" ]
diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old

@@ -63,19 +63,19 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols.old > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -n | 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 -a -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -a -n | 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 -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+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 -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 addb94d..cf2e064 100755
--- a/tests/test-depmod/08basedir.sh
+++ b/tests/test-depmod/08basedir.sh
@@ -17,7 +17,7 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
   $MODULE_DIR

# Expect no output.
-[ "`./depmod -b /BASEDIR 2>&1`" = "" ]
+[ "`depmod -b /BASEDIR 2>&1`" = "" ]

# Check results: expect 5 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 5 ]
@@ -31,27 +31,27 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old

# Synonyms
-[ "`./depmod -b /BASEDIR  -a`" = "" ]
+[ "`depmod -b /BASEDIR  -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 -A`" = "" ]
+[ "`depmod -b /BASEDIR -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`" = "" ]
+[ "`depmod -b /BASEDIR -e -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 -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 -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 -A $MODTEST_VERSION`" = "" ]
diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old

@@ -59,19 +59,19 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -b /BASEDIR -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -b /BASEDIR -n | 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 -b /BASEDIR -a -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -b /BASEDIR -a -n | 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 -b /BASEDIR -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -b /BASEDIR -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 -b /BASEDIR -e -n -A $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -b /BASEDIR -e -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/09alias.sh b/tests/test-depmod/09alias.sh
index 36bc9d6..4cb040d 100755
--- a/tests/test-depmod/09alias.sh
+++ b/tests/test-depmod/09alias.sh
@@ -13,7 +13,7 @@ ln tests/data/$BITNESS$ENDIAN/alias/alias-$BITNESS.ko \
   $MODULE_DIR

# Expect no normal output.
-[ "`./depmod 2>&1`" = "" ]
+[ "`depmod 2>&1`" = "" ]

# Check results: expect 2 lines.
[ `grep -vc '^#' < $MODULE_DIR/modules.alias` = 2 ]
@@ -30,7 +30,7 @@ ln tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko \
   $MODULE_DIR

# Expect no normal output.
-[ "`./depmod 2>&1`" = "" ]
+[ "`depmod 2>&1`" = "" ]

# Check results: expect 2 lines.
[ `grep -vc '^#' < $MODULE_DIR/modules.alias` = 2 ]
diff --git a/tests/test-depmod/10badcommand.sh b/tests/test-depmod/10badcommand.sh
index 523ac21..898a4fa 100755
--- a/tests/test-depmod/10badcommand.sh
+++ b/tests/test-depmod/10badcommand.sh
@@ -4,22 +4,22 @@
for ENDIAN in -le -be; do
for BITNESS in 32 64; do

-[ "`./depmod --unknown 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod --unknown 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]

-[ "`./depmod -v --unknown 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
-[ "`./depmod --unknown -v 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod -v --unknown 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod --unknown -v 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]

-[ "`./depmod 2.6.0 --unknown 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
-[ "`./depmod --unknown 2.6.0 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod 2.6.0 --unknown 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod --unknown 2.6.0 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]

-[ "`./depmod -v 2.6.0 --unknown 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
-[ "`./depmod -v --unknown 2.6.0 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod -v 2.6.0 --unknown 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod -v --unknown 2.6.0 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]

-[ "`./depmod 2.6.0 -v --unknown 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
-[ "`./depmod --unknown -v 2.6.0 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod 2.6.0 -v --unknown 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod --unknown -v 2.6.0 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]

-[ "`./depmod 2.6.0 --unknown -v 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
-[ "`./depmod --unknown 2.6.0 -v 2>&1 | head -1`" = "./depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod 2.6.0 --unknown -v 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]
+[ "`depmod --unknown 2.6.0 -v 2>&1 | head -1`" = "depmod: malformed/unrecognized option '--unknown'" ]

done
done
diff --git a/tests/test-depmod/11quick.sh b/tests/test-depmod/11quick.sh
index 419b1dc..44bfd82 100755
--- a/tests/test-depmod/11quick.sh
+++ b/tests/test-depmod/11quick.sh
@@ -18,7 +18,7 @@ cp tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \

# First time, there is no modules.dep, so it will be generated.
# Expect no output.
-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]

# Check modules.dep results: expect 5 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 5 ]
@@ -42,7 +42,7 @@ cp $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
# Now, second run should do nothing.
cp /dev/null $MODULE_DIR/modules.dep
cp /dev/null $MODULE_DIR/modules.symbols
-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]
diff -u /dev/null $MODULE_DIR/modules.dep
diff -u /dev/null $MODULE_DIR/modules.symbols

@@ -50,19 +50,19 @@ diff -u /dev/null $MODULE_DIR/modules.symbols
sleep 1
touch $MODULE_DIR

-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]
diff -u /dev/null $MODULE_DIR/modules.dep
diff -u /dev/null $MODULE_DIR/modules.symbols

# Touch a non-module, nothing.
echo "Test" > $MODULE_DIR/README
-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]
diff -u /dev/null $MODULE_DIR/modules.dep
diff -u /dev/null $MODULE_DIR/modules.symbols

# Touch a module, wham.
touch $MODULE_DIR/noexport_doubledep-$BITNESS.ko
-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]
diff -u $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.dep
diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols

@@ -70,6 +70,6 @@ diff -u $MODULE_DIR/modules.symbols.old $MODULE_DIR/modules.symbols
cp /dev/null $MODULE_DIR/modules.dep
cp /dev/null $MODULE_DIR/modules.symbols
rm $MODULE_DIR/noexport_doubledep-$BITNESS.ko
-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]
diff -u /dev/null $MODULE_DIR/modules.dep
diff -u /dev/null $MODULE_DIR/modules.symbols
diff --git a/tests/test-depmod/12compressed.sh b/tests/test-depmod/12compressed.sh
index f13237c..3f60cdb 100755
--- a/tests/test-depmod/12compressed.sh
+++ b/tests/test-depmod/12compressed.sh
@@ -21,7 +21,7 @@ gzip `find $MODULE_DIR -name '*.ko'`

# First time, there is no modules.dep, so it will be generated.
# Expect no output.
-[ "`./depmod -A 2>&1`" = "" ]
+[ "`depmod -A 2>&1`" = "" ]

# Check modules.dep results: expect 5 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 5 ]
@@ -43,79 +43,79 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

# Synonyms
-[ "`./depmod $MODTEST_UNAME`" = "" ]
+[ "`depmod $MODTEST_UNAME`" = "" ]
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 -a`" = "" ]
+[ "`depmod -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 -a $MODTEST_UNAME`" = "" ]
+[ "`depmod -a $MODTEST_UNAME`" = "" ]
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 -A`" = "" ]
+[ "`depmod -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 -A $MODTEST_UNAME`" = "" ]
+[ "`depmod -A $MODTEST_UNAME`" = "" ]
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`" = "" ]
+[ "`depmod -e -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 -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
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

-[ "`./depmod --all`" = "" ]
+[ "`depmod --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 --quick`" = "" ]
+[ "`depmod --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`" = "" ]
+[ "`depmod -e --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 --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 --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 --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
@@ -125,19 +125,19 @@ mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols.old > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -n | 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 -a -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -a -n | 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 -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+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 -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 e11b809..3b48ea0 100755
--- a/tests/test-depmod/13compressed-maps.sh
+++ b/tests/test-depmod/13compressed-maps.sh
@@ -31,7 +31,7 @@ cp tests/data/$BITNESS$ENDIAN/map/ccw_map-$BITNESS.ko \
gzip `find $MODULE_DIR -name '*.ko'`

# Expect no output.
-[ "`./depmod`" = "" ]
+[ "`depmod`" = "" ]

# Check PCI: expect 2 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.pcimap` = 2 ]
@@ -94,7 +94,7 @@ mv $MODULE_DIR/modules.inputmap $MODULE_DIR/modules.inputmap.old
mv $MODULE_DIR/modules.ofmap $MODULE_DIR/modules.ofmap.old

# Synonyms
-[ "`./depmod -a`" = "" ]
+[ "`depmod -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
@@ -104,7 +104,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 -A`" = "" ]
+[ "`depmod -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
@@ -114,7 +114,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 -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 +124,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 -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
@@ -138,16 +138,16 @@ diff -u $MODULE_DIR/modules.ofmap.old $MODULE_DIR/modules.ofmap
grep -hv '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.pcimap.old $MODULE_DIR/modules.usbmap.old $MODULE_DIR/modules.ccwmap.old $MODULE_DIR/modules.ieee1394map.old $MODULE_DIR/modules.isapnpmap.old $MODULE_DIR/modules.inputmap.old $MODULE_DIR/modules.ofmap.old > tests/tmp/out

# Stdout versions.
-./depmod -n | grep -v '^#' > tests/tmp/stdout
+depmod -n | grep -v '^#' > tests/tmp/stdout
diff -u tests/tmp/out tests/tmp/stdout

-./depmod -a -n | grep -v '^#' > $MODULE_DIR/modules.dep
+depmod -a -n | grep -v '^#' > $MODULE_DIR/modules.dep
diff -u tests/tmp/out tests/tmp/stdout

-./depmod -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.dep
+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 -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 ac7fd51..5f29e03 100755
--- a/tests/test-depmod/14updates.sh
+++ b/tests/test-depmod/14updates.sh
@@ -25,7 +25,7 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_nodep-$BITNESS.ko \
for iter in override not-override; do

# Expect no output.
-[ "`./depmod 2>&1`" = "" ]
+[ "`depmod 2>&1`" = "" ]

# Check modules.dep results: expect 5 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 5 ]
@@ -48,79 +48,79 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

# Synonyms
-[ "`./depmod $MODTEST_UNAME`" = "" ]
+[ "`depmod $MODTEST_UNAME`" = "" ]
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 -a`" = "" ]
+[ "`depmod -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 -a $MODTEST_UNAME`" = "" ]
+[ "`depmod -a $MODTEST_UNAME`" = "" ]
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 -A`" = "" ]
+[ "`depmod -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 -A $MODTEST_UNAME`" = "" ]
+[ "`depmod -A $MODTEST_UNAME`" = "" ]
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`" = "" ]
+[ "`depmod -e -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 -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
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

-[ "`./depmod --all`" = "" ]
+[ "`depmod --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 --quick`" = "" ]
+[ "`depmod --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`" = "" ]
+[ "`depmod -e --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 --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 --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 --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
@@ -130,19 +130,19 @@ mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols.old > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -n | 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 -a -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -a -n | 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 -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+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 -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 bcc984e..539e12f 100755
--- a/tests/test-depmod/15symlink.sh
+++ b/tests/test-depmod/15symlink.sh
@@ -27,7 +27,7 @@ ln -s ../../../updates $MODULE_DIR/updates
ln tests/data/$BITNESS$ENDIAN/rename/rename-new-$BITNESS.ko tests/tmp/updates

# Expect no output.
-[ "`./depmod 2>&1`" = "" ]
+[ "`depmod 2>&1`" = "" ]

# Check modules.dep results: expect 6 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 6 ]
@@ -50,79 +50,79 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

# Synonyms
-[ "`./depmod $MODTEST_UNAME`" = "" ]
+[ "`depmod $MODTEST_UNAME`" = "" ]
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 -a`" = "" ]
+[ "`depmod -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 -a $MODTEST_UNAME`" = "" ]
+[ "`depmod -a $MODTEST_UNAME`" = "" ]
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 -A`" = "" ]
+[ "`depmod -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 -A $MODTEST_UNAME`" = "" ]
+[ "`depmod -A $MODTEST_UNAME`" = "" ]
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`" = "" ]
+[ "`depmod -e -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 -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
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

-[ "`./depmod --all`" = "" ]
+[ "`depmod --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 --quick`" = "" ]
+[ "`depmod --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`" = "" ]
+[ "`depmod -e --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 --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 --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 --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
@@ -132,19 +132,19 @@ mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols.old > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -n | 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 -a -n | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -a -n | 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 -n -a $MODTEST_VERSION | grep -v '^#' > $MODULE_DIR/modules.all
+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 -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 2423ae0..cb3cc81 100755
--- a/tests/test-depmod/16specific-modules.sh
+++ b/tests/test-depmod/16specific-modules.sh
@@ -19,7 +19,7 @@ ln tests/data/$BITNESS$ENDIAN/normal/export_dep-$BITNESS.ko \
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.
-[ "`./depmod $ALL 2>&1`" = "" ]
+[ "`depmod $ALL 2>&1`" = "" ]

# Check modules.dep results: expect 5 lines
[ `grep -vc '^#' < $MODULE_DIR/modules.dep` = 5 ]
@@ -41,31 +41,31 @@ mv $MODULE_DIR/modules.dep $MODULE_DIR/modules.dep.old
mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old

# Synonyms
-[ "`./depmod $MODTEST_UNAME $ALL`" = "" ]
+[ "`depmod $MODTEST_UNAME $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 $ALL`" = "" ]
+[ "`depmod -e $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 $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 $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 $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
@@ -75,15 +75,15 @@ mv $MODULE_DIR/modules.symbols $MODULE_DIR/modules.symbols.old
grep -vh '^#' $MODULE_DIR/modules.dep.old $MODULE_DIR/modules.symbols.old > $MODULE_DIR/modules.all.old

# Stdout versions.
-./depmod -n $ALL | grep -v '^#' > $MODULE_DIR/modules.all
+depmod -n $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 -n $MODTEST_VERSION $ALL | grep -v '^#' > $MODULE_DIR/modules.all
+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 -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

diff --git a/tests/test-depmod/disabled_01backcompat.sh b/tests/test-depmod/disabled_01backcompat.sh
index e672aa5..d609cb8 100755
--- a/tests/test-depmod/disabled_01backcompat.sh
+++ b/tests/test-depmod/disabled_01backcompat.sh
@@ -1,16 +1,16 @@
#! /bin/sh

# Backwards compat using explicit version number
-[ "`./depmod 1.5.48 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
-[ "`./depmod 2.0.1 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
-[ "`./depmod 2.4.20 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
-[ "`./depmod 2.4.49 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
+[ "`depmod 1.5.48 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
+[ "`depmod 2.0.1 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
+[ "`depmod 2.4.20 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
+[ "`depmod 2.4.49 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]

# Implicit version number.
-[ "`MODTEST_UNAME=1.5.48 ./depmod 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
-[ "`MODTEST_UNAME=2.0.1 ./depmod 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
-[ "`MODTEST_UNAME=2.4.20 ./depmod 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
-[ "`MODTEST_UNAME=2.4.49 ./depmod 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
+[ "`MODTEST_UNAME=1.5.48 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
+[ "`MODTEST_UNAME=2.0.1 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
+[ "`MODTEST_UNAME=2.4.20 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
+[ "`MODTEST_UNAME=2.4.49 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]

# Create one for it to find, put it in the path.
echo '#! /bin/sh' > tests/tmp/depmod.old
@@ -22,7 +22,7 @@ PATH=`pwd`/tests/tmp:$PATH
MODTEST_UNAME=2.4.20

# If explicit path given, shouldn't search path.
-[ "`./depmod 2>&1`" = "Version requires old depmod, but couldn't run ./depmod.old: No such file or directory" ]
+[ "`depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]

# No args expected
[ "`depmod 2>&1`" = "DEPMOD.OLD" ]
diff --git a/tests/test-insmod/02simple.sh b/tests/test-insmod/02simple.sh
index 850f598..5248513 100755
--- a/tests/test-insmod/02simple.sh
+++ b/tests/test-insmod/02simple.sh
@@ -1,12 +1,12 @@
#! /bin/sh

# If it doesn't exist, kill it.
-[ "`./insmod nonexistent-file 2>&1`" = "insmod: can't read 'nonexistent-file': No such file or directory" ]
+[ "`insmod nonexistent-file 2>&1`" = "insmod: can't read 'nonexistent-file': No such file or directory" ]

# Make sure it passes module correctly.
SIZE=`wc -c < tests/test-insmod/02simple.sh`
-[ "`./insmod tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]

# Check options passed intact.
-[ "`./insmod tests/test-insmod/02simple.sh a`" = "INIT_MODULE: $SIZE a " ]
-[ "`./insmod tests/test-insmod/02simple.sh a b`" = "INIT_MODULE: $SIZE a b " ]
+[ "`insmod tests/test-insmod/02simple.sh a`" = "INIT_MODULE: $SIZE a " ]
+[ "`insmod tests/test-insmod/02simple.sh a b`" = "INIT_MODULE: $SIZE a b " ]
diff --git a/tests/test-insmod/03options.sh b/tests/test-insmod/03options.sh
index 66b47fd..321e113 100755
--- a/tests/test-insmod/03options.sh
+++ b/tests/test-insmod/03options.sh
@@ -2,15 +2,15 @@

SIZE=`wc -c < tests/test-insmod/02simple.sh`
# Old options are ignored.
-[ "`./insmod -p tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
-[ "`./insmod -s tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
-[ "`./insmod -f tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
-[ "`./insmod -p -f -s tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -p tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -s tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -f tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -p -f -s tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]

# --version and -v
VERSION=`grep ^VERSION Makefile | sed 's/.*=[ 	]*//'`
-[ "`./insmod -V`" = "module-init-tools version $VERSION" ]
-[ "`./insmod --version`" = "module-init-tools version $VERSION" ]
+[ "`insmod -V`" = "module-init-tools version $VERSION" ]
+[ "`insmod --version`" = "module-init-tools version $VERSION" ]

# Don't try to quote or anything: we're not smart enough.
-[ "`./insmod tests/test-insmod/02simple.sh 'foo="baz bar"'`" = "INIT_MODULE: $SIZE foo=\"baz bar\" " ]
+[ "`insmod tests/test-insmod/02simple.sh 'foo="baz bar"'`" = "INIT_MODULE: $SIZE foo=\"baz bar\" " ]
diff --git a/tests/test-insmod/04stdin.sh b/tests/test-insmod/04stdin.sh
index 31fe2c3..1891760 100755
--- a/tests/test-insmod/04stdin.sh
+++ b/tests/test-insmod/04stdin.sh
@@ -1,7 +1,7 @@
#! /bin/sh

SIZE=`wc -c < tests/test-insmod/02simple.sh`
-[ "`./insmod - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
-[ "`./insmod -s - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
-[ "`./insmod -f - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
-[ "`./insmod -p -f -s - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -s - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -f - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
+[ "`insmod -p -f -s - < tests/test-insmod/02simple.sh`" = "INIT_MODULE: $SIZE " ]
diff --git a/tests/test-insmod/disabled01backcompat.sh b/tests/test-insmod/disabled01backcompat.sh
index 1f64fa9..a6c80a9 100755
--- a/tests/test-insmod/disabled01backcompat.sh
+++ b/tests/test-insmod/disabled01backcompat.sh
@@ -4,7 +4,7 @@ MODTEST_DO_CREATE_MODULE=1
export MODTEST_DO_CREATE_MODULE

# Should fail to run (sys_create_module succeeds), not find insmod.old.
-[ "`./insmod 2>&1`" = "Kernel requires old insmod, but couldn't run ./insmod.old: No such file or directory" ]
+[ "`insmod 2>&1`" = "Kernel requires old insmod, but couldn't run ./insmod.old: No such file or directory" ]

# Create one for it to find, put it in the path
echo '#! /bin/sh' > tests/tmp/insmod.old
@@ -14,7 +14,7 @@ chmod a+x tests/tmp/insmod.old
PATH=`pwd`/tests/tmp:$PATH

# If explicit path given, shouldn't search path.
-[ "`./insmod 2>&1`" = "Kernel requires old insmod, but couldn't run ./insmod.old: No such file or directory" ]
+[ "`insmod 2>&1`" = "Kernel requires old insmod, but couldn't run ./insmod.old: No such file or directory" ]

# No args expected
[ "`insmod`" = "INSMOD.OLD" ]
diff --git a/tests/test-lsmod/01empty.sh b/tests/test-lsmod/01empty.sh
index fc55536..fbfb4e9 100755
--- a/tests/test-lsmod/01empty.sh
+++ b/tests/test-lsmod/01empty.sh
@@ -4,4 +4,4 @@ mkdir -p tests/tmp/proc
touch tests/tmp/proc/modules

# This should be true
-[ "`./lsmod`" = "Module                  Size  Used by" ]
+[ "`lsmod`" = "Module                  Size  Used by" ]
diff --git a/tests/test-lsmod/03oldstyle.sh b/tests/test-lsmod/03oldstyle.sh
index b665f73..b07e874 100755
--- a/tests/test-lsmod/03oldstyle.sh
+++ b/tests/test-lsmod/03oldstyle.sh
@@ -11,7 +11,7 @@ echo 'fuzz 104 1 fuzz_dep [permenant]' >> tests/tmp/proc/modules
echo 'fuzzy 105 1 fuzzy_dep [permenant] [unsafe]' >> tests/tmp/proc/modules
echo 'fuzzier 106 0 [permenant] [unsafe]' >> tests/tmp/proc/modules

-[ "`./lsmod`" = "Module                  Size  Used by
+[ "`lsmod`" = "Module                  Size  Used by
foo                      100  0 
bar                      101  1 
baz                      102  1 baz_dep
@@ -24,6 +24,6 @@ fuzzier                  106  0 [permenant] [unsafe]" ]
echo 'baz 102' > tests/tmp/proc/modules
echo 'bazz 2147483648' >> tests/tmp/proc/modules

-[ "`./lsmod`" = "Module                  Size  Used by
+[ "`lsmod`" = "Module                  Size  Used by
baz                      102
bazz                2147483648" ]
diff --git a/tests/test-lsmod/04newstyle.sh b/tests/test-lsmod/04newstyle.sh
index 4748697..a39878f 100755
--- a/tests/test-lsmod/04newstyle.sh
+++ b/tests/test-lsmod/04newstyle.sh
@@ -14,7 +14,7 @@ echo 'newstyle 107 0 - unknownfield' >> tests/tmp/proc/modules
echo 'newstyle2 108 0 newstyle2_dep, unknownfield unknownfield2' >> tests/tmp/proc/modules

# This should be true
-[ "`./lsmod`" = "Module                  Size  Used by
+[ "`lsmod`" = "Module                  Size  Used by
foo                      100  0 
bar                      101  1 
baz                      102  1 baz_dep
diff --git a/tests/test-lsmod/disabled02backcompat.sh b/tests/test-lsmod/disabled02backcompat.sh
index 2ad5e26..38ebfd1 100755
--- a/tests/test-lsmod/disabled02backcompat.sh
+++ b/tests/test-lsmod/disabled02backcompat.sh
@@ -4,7 +4,7 @@ MODTEST_DO_CREATE_MODULE=1
export MODTEST_DO_CREATE_MODULE

# Should fail to run (sys_create_module succeeds), not find lsmod.old.
-[ "`./lsmod 2>&1`" = "Kernel requires old lsmod, but couldn't run ./lsmod.old: No such file or directory" ]
+[ "`lsmod 2>&1`" = "Kernel requires old lsmod, but couldn't run ./lsmod.old: No such file or directory" ]

# Create one for it to find, put it in the path
echo '#! /bin/sh' > tests/tmp/lsmod.old
@@ -14,7 +14,7 @@ chmod a+x tests/tmp/lsmod.old
PATH=`pwd`/tests/tmp:$PATH

# If explicit path given, shouldn't search path.
-[ "`./lsmod 2>&1`" = "Kernel requires old lsmod, but couldn't run ./lsmod.old: No such file or directory" ]
+[ "`lsmod 2>&1`" = "Kernel requires old lsmod, but couldn't run ./lsmod.old: No such file or directory" ]

# No args expected
[ "`lsmod 2>&1`" = "LSMOD.OLD" ]
diff --git a/tests/test-modindex/05order.sh b/tests/test-modindex/05order.sh
index 7109e7b..f9c560c 100644
--- a/tests/test-modindex/05order.sh
+++ b/tests/test-modindex/05order.sh
@@ -2,46 +2,46 @@

# Index preserves order of values for same key

-./modindex -o tests/tmp/index << EOF
+modindex -o tests/tmp/index << EOF
a 1
a 2
a 3
EOF

-[ "`./modindex -d tests/tmp/index`" = "a 1
+[ "`modindex -d tests/tmp/index`" = "a 1
a 2
a 3" ]

-./modindex -o tests/tmp/index << EOF
+modindex -o tests/tmp/index << EOF
a 3
a 2
a 1
EOF

-[ "`./modindex -d tests/tmp/index`" = "a 3
+[ "`modindex -d tests/tmp/index`" = "a 3
a 2
a 1" ]

# Index preserves order of values across multiple keys

-./modindex -o tests/tmp/index << EOF
+modindex -o tests/tmp/index << EOF
*a 1
b* 2
* 3
EOF

-[ "`./modindex -w tests/tmp/index ba`" = "Found value(s):
+[ "`modindex -w tests/tmp/index ba`" = "Found value(s):
1
2
3" ]

-./modindex -o tests/tmp/index << EOF
+modindex -o tests/tmp/index << EOF
* 1
b* 2
*a 3
EOF

-[ "`./modindex -w tests/tmp/index ba`" = "Found value(s):
+[ "`modindex -w tests/tmp/index ba`" = "Found value(s):
1
2
3" ]
diff --git a/tests/test-modinfo/02all.sh b/tests/test-modinfo/02all.sh
index 19c2a51..eee36fa 100755
--- a/tests/test-modinfo/02all.sh
+++ b/tests/test-modinfo/02all.sh
@@ -15,15 +15,15 @@ ln tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko \
echo "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko: /lib/modules/$MODTEST_UNAME/modinfo-crap-$BITNESS.ko" > $MODULE_DIR/modules.dep

# Found by reading modules.dep
-OUTPUT1=`./modinfo modinfo-$BITNESS 2>&1 | md5sum`
+OUTPUT1=`modinfo modinfo-$BITNESS 2>&1 | md5sum`
# Found by absolute path.
-OUTPUT2=`./modinfo /lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko 2>&1 | md5sum`
+OUTPUT2=`modinfo /lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko 2>&1 | md5sum`

# Same except for filename
[ x"$OUTPUT1" = x"$OUTPUT2" ]

# Expect 10 lines.
-OUTPUT=`./modinfo tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`
+OUTPUT=`modinfo tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`
[ `echo "$OUTPUT" | wc -l` -eq 10 ]

# Test each one.
@@ -38,13 +38,13 @@ OUTPUT=`./modinfo tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`
[ "`echo "$OUTPUT" | grep ' undescribed'`" =         "parm:           undescribed:int" ]

# Test filename from modules.dep
-[ "`./modinfo modinfo-$BITNESS | grep filename`" =    "filename:       /lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko" ]
+[ "`modinfo modinfo-$BITNESS | grep filename`" =    "filename:       /lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko" ]

# Test multiple modules on cmdline.
-[ `./modinfo tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1 | wc -l` -eq 20 ]
+[ `modinfo tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1 | wc -l` -eq 20 ]

# Test 0-fill
-[ "`./modinfo -0 tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1 | tr -dc '\000' | tr '\000' @`" = "@@@@@@@@@@" ]
+[ "`modinfo -0 tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1 | tr -dc '\000' | tr '\000' @`" = "@@@@@@@@@@" ]

done
done
diff --git a/tests/test-modinfo/03field.sh b/tests/test-modinfo/03field.sh
index e87f1f8..55bdb84 100755
--- a/tests/test-modinfo/03field.sh
+++ b/tests/test-modinfo/03field.sh
@@ -16,39 +16,39 @@ echo "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko: /lib/modules/$MODTEST_UNA

# Test individual field extraction: by module search and abs. path
for file in modinfo-$BITNESS tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko; do
-    [ "`./modinfo -F randomcrap $file 2>&1`" = "my random crap which I use to test stuff with" ]
-    [ "`./modinfo -F vermagic $file 2>&1`" = "my magic" ]
-    [ "`./modinfo -F author $file 2>&1`" = "AUTHOR" ]
-    [ "`./modinfo -a $file 2>&1`" = "AUTHOR" ]
-    [ "`./modinfo -F description $file 2>&1`" = "DESCRIPTION" ]
-    [ "`./modinfo -d $file 2>&1`" = "DESCRIPTION" ]
-    [ "`./modinfo -F alias $file 2>&1`" = "ALIAS1
-ALIAS2" ] || [ "`./modinfo -F alias $file 2>&1`" = "ALIAS2
+    [ "`modinfo -F randomcrap $file 2>&1`" = "my random crap which I use to test stuff with" ]
+    [ "`modinfo -F vermagic $file 2>&1`" = "my magic" ]
+    [ "`modinfo -F author $file 2>&1`" = "AUTHOR" ]
+    [ "`modinfo -a $file 2>&1`" = "AUTHOR" ]
+    [ "`modinfo -F description $file 2>&1`" = "DESCRIPTION" ]
+    [ "`modinfo -d $file 2>&1`" = "DESCRIPTION" ]
+    [ "`modinfo -F alias $file 2>&1`" = "ALIAS1
+ALIAS2" ] || [ "`modinfo -F alias $file 2>&1`" = "ALIAS2
ALIAS1" ]
-    [ "`./modinfo -F parm $file 2>&1`" = "foo:The number of foos on the card
+    [ "`modinfo -F parm $file 2>&1`" = "foo:The number of foos on the card
described:A well-described parameter" ] ||
-    [ "`./modinfo -F parm $file 2>&1`" = "described:A well-described parameter
+    [ "`modinfo -F parm $file 2>&1`" = "described:A well-described parameter
foo:The number of foos on the card" ]

-    [ "`./modinfo -F parmtype $file 2>&1`" = "described:uint
+    [ "`modinfo -F parmtype $file 2>&1`" = "described:uint
undescribed:int" ] ||
-    [ "`./modinfo -F parmtype $file 2>&1`" = "undescribed:int
+    [ "`modinfo -F parmtype $file 2>&1`" = "undescribed:int
described:uint" ]
-    [ "`./modinfo -F unknown $file 2>&1`" = "" ]
+    [ "`modinfo -F unknown $file 2>&1`" = "" ]
done

# Test filename output
-[ "`./modinfo -F filename modinfo-$BITNESS 2>&1`" = "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko" ]
-[ "`./modinfo -n modinfo-$BITNESS 2>&1`" = "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko" ]
-[ "`./modinfo -F filename tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`" = "tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko" ]
-[ "`./modinfo -n tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`" = "tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko" ]
+[ "`modinfo -F filename modinfo-$BITNESS 2>&1`" = "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko" ]
+[ "`modinfo -n modinfo-$BITNESS 2>&1`" = "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko" ]
+[ "`modinfo -F filename tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`" = "tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko" ]
+[ "`modinfo -n tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`" = "tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko" ]

# Test multiple modules on cmdline.
-[ "`./modinfo -F vermagic tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`" = "my magic
+[ "`modinfo -F vermagic tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1`" = "my magic
my magic" ]

# Test 0-fill
-[ "`./modinfo -0 -F alias tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1 | tr '\000' @`" = "ALIAS1@ALIAS2@" ]
+[ "`modinfo -0 -F alias tests/data/$BITNESS$ENDIAN/modinfo/modinfo-$BITNESS.ko 2>&1 | tr '\000' @`" = "ALIAS1@ALIAS2@" ]

done
done
diff --git a/tests/test-modinfo/04compressed.sh b/tests/test-modinfo/04compressed.sh
index a58a073..2427367 100755
--- a/tests/test-modinfo/04compressed.sh
+++ b/tests/test-modinfo/04compressed.sh
@@ -20,31 +20,31 @@ echo "/lib/modules/$MODTEST_UNAME/modinfo-$BITNESS.ko.gz: /lib/modules/$MODTEST_

# Test individual field extraction: by module search and abs. path
for file in modinfo-$BITNESS $MODULE_DIR/modinfo-$BITNESS.ko.gz; do
-    [ "`./modinfo -F randomcrap $file 2>&1`" = "my random crap which I use to test stuff with" ]
-    [ "`./modinfo -F vermagic $file 2>&1`" = "my magic" ]
-    [ "`./modinfo -F author $file 2>&1`" = "AUTHOR" ]
-    [ "`./modinfo -F description $file 2>&1`" = "DESCRIPTION" ]
-    [ "`./modinfo -F alias $file 2>&1`" = "ALIAS1
+    [ "`modinfo -F randomcrap $file 2>&1`" = "my random crap which I use to test stuff with" ]
+    [ "`modinfo -F vermagic $file 2>&1`" = "my magic" ]
+    [ "`modinfo -F author $file 2>&1`" = "AUTHOR" ]
+    [ "`modinfo -F description $file 2>&1`" = "DESCRIPTION" ]
+    [ "`modinfo -F alias $file 2>&1`" = "ALIAS1
ALIAS2" ] || [ "`modinfo -F alias $file 2>&1`" = "ALIAS2
ALIAS1" ]
-    [ "`./modinfo -F parm $file 2>&1`" = "foo:The number of foos on the card
+    [ "`modinfo -F parm $file 2>&1`" = "foo:The number of foos on the card
described:A well-described parameter" ] ||
-    [ "`./modinfo -F parm $file 2>&1`" = "described:A well-described parameter
+    [ "`modinfo -F parm $file 2>&1`" = "described:A well-described parameter
foo:The number of foos on the card" ]

-    [ "`./modinfo -F parmtype $file 2>&1`" = "described:uint
+    [ "`modinfo -F parmtype $file 2>&1`" = "described:uint
undescribed:int" ] ||
-    [ "`./modinfo -F parmtype $file 2>&1`" = "undescribed:int
+    [ "`modinfo -F parmtype $file 2>&1`" = "undescribed:int
described:uint" ]
-    [ "`./modinfo -F unknown $file 2>&1`" = "" ]
+    [ "`modinfo -F unknown $file 2>&1`" = "" ]
done

# Test multiple modules on cmdline.
-[ "`./modinfo -F vermagic $MODULE_DIR/modinfo-$BITNESS.ko.gz $MODULE_DIR/modinfo-$BITNESS.ko.gz 2>&1`" = "my magic
+[ "`modinfo -F vermagic $MODULE_DIR/modinfo-$BITNESS.ko.gz $MODULE_DIR/modinfo-$BITNESS.ko.gz 2>&1`" = "my magic
my magic" ]

# Test 0-fill
-[ "`./modinfo -0 -F alias $MODULE_DIR/modinfo-$BITNESS.ko.gz 2>&1 | tr '\000' @`" = "ALIAS1@ALIAS2@" ]
+[ "`modinfo -0 -F alias $MODULE_DIR/modinfo-$BITNESS.ko.gz 2>&1 | tr '\000' @`" = "ALIAS1@ALIAS2@" ]

done
done
diff --git a/tests/test-modinfo/disabled01backcompat.sh b/tests/test-modinfo/disabled01backcompat.sh
index 2960f4c..ff9cab8 100755
--- a/tests/test-modinfo/disabled01backcompat.sh
+++ b/tests/test-modinfo/disabled01backcompat.sh
@@ -4,7 +4,7 @@ MODTEST_DO_CREATE_MODULE=1
export MODTEST_DO_CREATE_MODULE

# Should fail to run (sys_create_module succeeds), not find modinfo.old.
-[ "`./modinfo 2>&1`" = "Kernel requires old modinfo, but couldn't run ./modinfo.old: No such file or directory" ]
+[ "`modinfo 2>&1`" = "Kernel requires old modinfo, but couldn't run ./modinfo.old: No such file or directory" ]

# Create one for it to find, put it in the path
echo '#! /bin/sh' > tests/tmp/modinfo.old
@@ -14,7 +14,7 @@ chmod a+x tests/tmp/modinfo.old
PATH=`pwd`/tests/tmp:$PATH

# If explicit path given, shouldn't search path.
-[ "`./modinfo 2>&1`" = "Kernel requires old modinfo, but couldn't run ./modinfo.old: No such file or directory" ]
+[ "`modinfo 2>&1`" = "Kernel requires old modinfo, but couldn't run ./modinfo.old: No such file or directory" ]

# No args expected
[ "`modinfo 2>&1`" = "MODINFO.OLD" ]
diff --git a/tests/test-modprobe-indexed/02simple.sh b/tests/test-modprobe-indexed/02simple.sh
index 355b167..446f7e1 100644
--- a/tests/test-modprobe-indexed/02simple.sh
+++ b/tests/test-modprobe-indexed/02simple.sh
@@ -15,14 +15,14 @@ echo "noexport_nodep_$BITNESS noexport_nodep-$BITNESS.ko:" | ./modindex -o $MODU
SIZE=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`

# No args
-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]

# With quoted args
-[ "`./modprobe noexport_nodep-$BITNESS 'foo="bar baz"' 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS 'foo="bar baz"' 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
# With unquoted args
-[ "`./modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]

# Check underscore equivalence.
-[ "`./modprobe noexport-nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
-[ "`./modprobe noexport-nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
-[ "`./modprobe noexport_nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport-nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport-nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
diff --git a/tests/test-modprobe-indexed/03deps.sh b/tests/test-modprobe-indexed/03deps.sh
index 8dcfc86..3cbd39f 100644
--- a/tests/test-modprobe-indexed/03deps.sh
+++ b/tests/test-modprobe-indexed/03deps.sh
@@ -35,26 +35,26 @@ SIZE_NOEXPORT_DOUBLEDEP=`wc -c < tests/data/$BITNESS/normal/noexport_doubledep-$
# Empty /sys/module/
mkdir -p tests/tmp/sys/module

-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`./modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP OPTIONS" ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
+[ "`modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP OPTIONS" ]

-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe export_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP OPTIONS" ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe export_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP OPTIONS" ]

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_NOEXPORT_DEP " ]
-[ "`./modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_NOEXPORT_DEP OPTIONS" ]

-[ "`./modprobe export_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe export_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP " ]
-[ "`./modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP OPTIONS" ]

-[ "`./modprobe noexport_doubledep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_doubledep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP 
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP " ]
-[ "`./modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP 
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP OPTIONS" ]

@@ -72,13 +72,13 @@ echo live > tests/tmp/sys/module/export_dep_$BITNESS/initstate
echo live > tests/tmp/sys/module/noexport_doubledep_$BITNESS/initstate

# Removal
-[ "`./modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
+[ "`modprobe -r export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
+[ "`modprobe -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
DELETE_MODULE: export_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]

@@ -100,6 +100,6 @@ echo 0 > tests/tmp/sys/module/noexport_dep_$BITNESS/refcnt
echo 0 > tests/tmp/sys/module/export_dep_$BITNESS/refcnt
echo 0 > tests/tmp/sys/module/newname/refcnt

-[ "`./modprobe -o newname -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: newname EXCL 
+[ "`modprobe -o newname -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: newname EXCL 
DELETE_MODULE: export_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
diff --git a/tests/test-modprobe-indexed/03underscores.sh b/tests/test-modprobe-indexed/03underscores.sh
index fe9fda4..0b93ea6 100644
--- a/tests/test-modprobe-indexed/03underscores.sh
+++ b/tests/test-modprobe-indexed/03underscores.sh
@@ -44,27 +44,27 @@ SIZE1=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`
SIZE2=`wc -c < tests/data/$BITNESS/normal/export_nodep-$BITNESS.ko`

# On command line (-r and normal)
-[ "`./modprobe noexport-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
-[ "`./modprobe -r noexport-nodep_$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe noexport-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe -r noexport-nodep_$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]

# In alias commands (source and target)
-[ "`./modprobe alias-_ 2>&1`" = "INIT_MODULE: $SIZE1 " ]
-[ "`./modprobe alias_- 2>&1`" = "INIT_MODULE: $SIZE1 " ]
-[ "`./modprobe -r alias-_ 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r alias_- 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe alias-_ 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe alias_- 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe -r alias-_ 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r alias_- 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]

# In option commands (NOT in arguments)
-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]
-[ "`./modprobe export-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]
+[ "`modprobe export-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]

# In install commands
-[ "`./modprobe test-_ 2>&1`" = "SYSTEM: echo install-_" ]
-[ "`./modprobe test_- 2>&1`" = "SYSTEM: echo install-_" ]
+[ "`modprobe test-_ 2>&1`" = "SYSTEM: echo install-_" ]
+[ "`modprobe test_- 2>&1`" = "SYSTEM: echo install-_" ]

# In remove commands
-[ "`./modprobe -r test-_ 2>&1`" = "SYSTEM: echo remove-_" ]
-[ "`./modprobe -r test_- 2>&1`" = "SYSTEM: echo remove-_" ]
+[ "`modprobe -r test-_ 2>&1`" = "SYSTEM: echo remove-_" ]
+[ "`modprobe -r test_- 2>&1`" = "SYSTEM: echo remove-_" ]

# NOT in include commands
-[ "`./modprobe test-include 2>&1`" = "SYSTEM: echo Included" ]
-[ "`./modprobe test_include 2>&1`" = "SYSTEM: echo Included" ]
+[ "`modprobe test-include 2>&1`" = "SYSTEM: echo Included" ]
+[ "`modprobe test_include 2>&1`" = "SYSTEM: echo Included" ]
diff --git a/tests/test-modprobe-indexed/10alias.sh b/tests/test-modprobe-indexed/10alias.sh
index f35349a..096c309 100644
--- a/tests/test-modprobe-indexed/10alias.sh
+++ b/tests/test-modprobe-indexed/10alias.sh
@@ -24,40 +24,40 @@ rm -f tests/tmp/etc/modprobe.d/modprobe.conf
echo Test > $MODULE_DIR/kernel/foo.ko

# Shouldn't complain if can't open modules.alias
-[ "`./modprobe bar 2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe bar 2>&1`" = "FATAL: Module bar not found." ]

# Now, alias found in modules.alias works.
echo "bar alias_$BITNESS" > $MODULE_DIR/modules.alias.bin.temp
./modindex -o $MODULE_DIR/modules.alias.bin < $MODULE_DIR/modules.alias.bin.temp
-[ "`./modprobe bar 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe bar 2>&1`" = "INIT_MODULE: $SIZE " ]

# Normal alias should override it.
mkdir -p tests/tmp/etc/modprobe.d
echo 'alias bar foo' > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]
+[ "`modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]

# If there's a real module, alias from modules.alias must NOT override.
echo "foo alias_$BITNESS" > $MODULE_DIR/modules.alias.bin.temp
./modindex -o $MODULE_DIR/modules.alias.bin < $MODULE_DIR/modules.alias.bin.temp
-[ "`./modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]
+[ "`modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]

# If there's an install command, modules.alias must not override.
echo 'install bar echo foo' > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe bar 2>&1`" = "SYSTEM: echo foo" ]
+[ "`modprobe bar 2>&1`" = "SYSTEM: echo foo" ]
echo 'remove bar echo foo remove' > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe -r bar 2>&1`" = "SYSTEM: echo foo remove" ]
+[ "`modprobe -r bar 2>&1`" = "SYSTEM: echo foo remove" ]

# Should gather up options from other alias name as well.
echo "bar alias_$BITNESS" > $MODULE_DIR/modules.alias.bin.temp
./modindex -o $MODULE_DIR/modules.alias.bin < $MODULE_DIR/modules.alias.bin.temp
echo "options bar option1" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "options alias_$BITNESS option2" >> tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe bar 2>&1`" = "INIT_MODULE: $SIZE option2 option1" ]
+[ "`modprobe bar 2>&1`" = "INIT_MODULE: $SIZE option2 option1" ]

# Duplicated alias: both get probed (either order)
echo "bar foo" >> $MODULE_DIR/modules.alias.bin.temp
./modindex -o $MODULE_DIR/modules.alias.bin < $MODULE_DIR/modules.alias.bin.temp
-OUT="`./modprobe bar 2>&1`"
+OUT="`modprobe bar 2>&1`"

[ "$OUT" = "INIT_MODULE: $SIZE option2 option1
INIT_MODULE: 5 option1" ] || [ "$OUT" = "INIT_MODULE: 5 option1
diff --git a/tests/test-modprobe-indexed/16showdepends.sh b/tests/test-modprobe-indexed/16showdepends.sh
index aaa0b00..4f1182b 100644
--- a/tests/test-modprobe-indexed/16showdepends.sh
+++ b/tests/test-modprobe-indexed/16showdepends.sh
@@ -26,13 +26,13 @@ EOF
# Build modules.dep.bin, which modprobe will prefer
./modindex -o $MODULE_DIR/modules.dep.bin < $MODULE_DIR/modules.dep.temp

-[ "`./modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
+[ "`modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
+[ "`modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko " ]

diff --git a/tests/test-modprobe/02simple.sh b/tests/test-modprobe/02simple.sh
index 98989ca..aa41769 100755
--- a/tests/test-modprobe/02simple.sh
+++ b/tests/test-modprobe/02simple.sh
@@ -16,14 +16,14 @@ echo "/lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko:" >> $MODULE_DIR/mo
SIZE=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`

# No args
-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]

# With quoted args
-[ "`./modprobe noexport_nodep-$BITNESS 'foo="bar baz"' 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS 'foo="bar baz"' 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
# With unquoted args
-[ "`./modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]

# Check underscore equivalence.
-[ "`./modprobe noexport-nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
-[ "`./modprobe noexport-nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
-[ "`./modprobe noexport_nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport-nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport-nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
diff --git a/tests/test-modprobe/02sys.sh b/tests/test-modprobe/02sys.sh
index a6d661a..462e418 100755
--- a/tests/test-modprobe/02sys.sh
+++ b/tests/test-modprobe/02sys.sh
@@ -23,26 +23,26 @@ SIZE_NOEXPORT_NODEP=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.
SIZE_EXPORT_NODEP=`wc -c < tests/data/$BITNESS/normal/export_nodep-$BITNESS.ko`

# If it can't open /sys/module, it should try anyway.
-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]

-[ "`./modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]

# If it doesn't exist in /sys/module/, remove should succeed.
mkdir -p tests/tmp/sys/module

-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe -r -v noexport_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
-[ "`./modprobe -r -v export_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
-[ "`./modprobe -r -v noexport-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
-[ "`./modprobe -r -v export-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe -r -v noexport_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -r -v export_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -r -v noexport-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -r -v export-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
# ... unless --first-time is specified (won't print status due to set -e).
-[ "`./modprobe --first-time -r noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is not in kernel." ]
-[ "`./modprobe --first-time -r export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is not in kernel." ]
-[ "`./modprobe --first-time -r noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is not in kernel." ]
-[ "`./modprobe --first-time -r export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is not in kernel." ]
+[ "`modprobe --first-time -r noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is not in kernel." ]
+[ "`modprobe --first-time -r export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is not in kernel." ]
+[ "`modprobe --first-time -r noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is not in kernel." ]
+[ "`modprobe --first-time -r export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is not in kernel." ]

# Now make a fake /sys/module structure for the test
# Note: no refcnt files (no unload support)
@@ -53,19 +53,19 @@ echo live > tests/tmp/sys/module/noexport_nodep_$BITNESS/initstate
echo live > tests/tmp/sys/module/export_nodep_$BITNESS/initstate

# If it does exist, insertion should "succeed".
-[ "`./modprobe -v noexport_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
-[ "`./modprobe -v export_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
-[ "`./modprobe -v noexport-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
-[ "`./modprobe -v export-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -v noexport_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -v export_nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -v noexport-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
+[ "`modprobe -v export-nodep-$BITNESS 2>&1; echo $?`" = "0" ]
# .. unless --first-time is specified.
-[ "`./modprobe --first-time noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
-[ "`./modprobe --first-time export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]
-[ "`./modprobe --first-time noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
-[ "`./modprobe --first-time export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]

# Removal should try (despite lack of unload support)
-[ "`./modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]

# Note: refcnt files (unload support)
rm -rf tests/tmp/sys/module
@@ -77,12 +77,12 @@ echo live > tests/tmp/sys/module/export_nodep_$BITNESS/initstate
echo 1 > tests/tmp/sys/module/export_nodep_$BITNESS/refcnt
echo 1 > tests/tmp/sys/module/noexport_nodep_$BITNESS/refcnt

-[ "`./modprobe --first-time noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
-[ "`./modprobe --first-time export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]
-[ "`./modprobe --first-time noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
-[ "`./modprobe --first-time export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS already in kernel." ]
+[ "`modprobe --first-time export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS already in kernel." ]

-[ "`./modprobe -r noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is in use." ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is in use." ]
-[ "`./modprobe -r noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is in use." ]
-[ "`./modprobe -r export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is in use." ]
+[ "`modprobe -r noexport_nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is in use." ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is in use." ]
+[ "`modprobe -r noexport-nodep-$BITNESS 2>&1`" = "FATAL: Module noexport_nodep_$BITNESS is in use." ]
+[ "`modprobe -r export-nodep-$BITNESS 2>&1`" = "FATAL: Module export_nodep_$BITNESS is in use." ]
diff --git a/tests/test-modprobe/03deps.sh b/tests/test-modprobe/03deps.sh
index 7fa61d5..efc20ca 100755
--- a/tests/test-modprobe/03deps.sh
+++ b/tests/test-modprobe/03deps.sh
@@ -35,26 +35,26 @@ SIZE_NOEXPORT_DOUBLEDEP=`wc -c < tests/data/$BITNESS/normal/noexport_doubledep-$
# Empty /sys/module/
mkdir -p tests/tmp/sys/module

-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`./modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP OPTIONS" ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
+[ "`modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP OPTIONS" ]

-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe export_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP OPTIONS" ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe export_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP OPTIONS" ]

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_NOEXPORT_DEP " ]
-[ "`./modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_NOEXPORT_DEP OPTIONS" ]

-[ "`./modprobe export_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe export_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP " ]
-[ "`./modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP OPTIONS" ]

-[ "`./modprobe noexport_doubledep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_doubledep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP 
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP " ]
-[ "`./modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_EXPORT_DEP 
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP OPTIONS" ]

@@ -72,13 +72,13 @@ echo live > tests/tmp/sys/module/export_dep_$BITNESS/initstate
echo live > tests/tmp/sys/module/noexport_doubledep_$BITNESS/initstate

# Removal
-[ "`./modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
+[ "`modprobe -r export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
+[ "`modprobe -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
DELETE_MODULE: export_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]

@@ -100,6 +100,6 @@ echo 0 > tests/tmp/sys/module/noexport_dep_$BITNESS/refcnt
echo 0 > tests/tmp/sys/module/export_dep_$BITNESS/refcnt
echo 0 > tests/tmp/sys/module/newname/refcnt

-[ "`./modprobe -o newname -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: newname EXCL 
+[ "`modprobe -o newname -r noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: newname EXCL 
DELETE_MODULE: export_dep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
diff --git a/tests/test-modprobe/03underscores.sh b/tests/test-modprobe/03underscores.sh
index 2c8f66c..c1e55e2 100755
--- a/tests/test-modprobe/03underscores.sh
+++ b/tests/test-modprobe/03underscores.sh
@@ -29,27 +29,27 @@ SIZE1=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`
SIZE2=`wc -c < tests/data/$BITNESS/normal/export_nodep-$BITNESS.ko`

# On command line (-r and normal)
-[ "`./modprobe noexport-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
-[ "`./modprobe -r noexport-nodep_$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe noexport-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe -r noexport-nodep_$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]

# In alias commands (source and target)
-[ "`./modprobe alias-_ 2>&1`" = "INIT_MODULE: $SIZE1 " ]
-[ "`./modprobe alias_- 2>&1`" = "INIT_MODULE: $SIZE1 " ]
-[ "`./modprobe -r alias-_ 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r alias_- 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe alias-_ 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe alias_- 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe -r alias-_ 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r alias_- 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]

# In option commands (NOT in arguments)
-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]
-[ "`./modprobe export-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]
+[ "`modprobe export-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE2 option-_" ]

# In install commands
-[ "`./modprobe test-_ 2>&1`" = "SYSTEM: echo install-_" ]
-[ "`./modprobe test_- 2>&1`" = "SYSTEM: echo install-_" ]
+[ "`modprobe test-_ 2>&1`" = "SYSTEM: echo install-_" ]
+[ "`modprobe test_- 2>&1`" = "SYSTEM: echo install-_" ]

# In remove commands
-[ "`./modprobe -r test-_ 2>&1`" = "SYSTEM: echo remove-_" ]
-[ "`./modprobe -r test_- 2>&1`" = "SYSTEM: echo remove-_" ]
+[ "`modprobe -r test-_ 2>&1`" = "SYSTEM: echo remove-_" ]
+[ "`modprobe -r test_- 2>&1`" = "SYSTEM: echo remove-_" ]

# NOT in include commands
-[ "`./modprobe test-include 2>&1`" = "SYSTEM: echo Included" ]
-[ "`./modprobe test_include 2>&1`" = "SYSTEM: echo Included" ]
+[ "`modprobe test-include 2>&1`" = "SYSTEM: echo Included" ]
+[ "`modprobe test_include 2>&1`" = "SYSTEM: echo Included" ]
diff --git a/tests/test-modprobe/04config.sh b/tests/test-modprobe/04config.sh
index 8cd2c81..cb85422 100755
--- a/tests/test-modprobe/04config.sh
+++ b/tests/test-modprobe/04config.sh
@@ -7,17 +7,17 @@ rm -rf tests/tmp/*

# Simple dump out test.
touch tests/tmp/empty
-[ "`./modprobe -C /empty -c 2>&1`" = "" ]
-[ "`./modprobe --config /empty --showconfig 2>&1`" = "" ]
+[ "`modprobe -C /empty -c 2>&1`" = "" ]
+[ "`modprobe --config /empty --showconfig 2>&1`" = "" ]

# Explicitly mentioned config files must exist.
-[ "`./modprobe -C FILE-WHICH-DOESNT-EXIST foo 2>&1`" = "FATAL: Failed to open config file FILE-WHICH-DOESNT-EXIST: No such file or directory" ]
+[ "`modprobe -C FILE-WHICH-DOESNT-EXIST foo 2>&1`" = "FATAL: Failed to open config file FILE-WHICH-DOESNT-EXIST: No such file or directory" ]

MODULE_DIR=tests/tmp/lib/modules/$MODTEST_UNAME
mkdir -p $MODULE_DIR
touch $MODULE_DIR/modules.dep

-[ "`./modprobe foo 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe foo 2>&1`" = "FATAL: Module foo not found." ]

# Create a simple config file.
mkdir -p tests/tmp/etc/modprobe.d
@@ -90,99 +90,99 @@ SIZE_NOEXPORT_DOUBLEDEP=`wc -c < tests/data/$BITNESS/normal/noexport_doubledep-$

# Test ignoring install & remove.

-[ "`./modprobe --ignore-install export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe -i export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe -i foo 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe -r --ignore-remove export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r -i export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -i -r foo 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe --ignore-install export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe -i export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe -i foo 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe -r --ignore-remove export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r -i export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -i -r foo 2>&1`" = "FATAL: Module foo not found." ]

# Test install & remove (fake modules)
-[ "`./modprobe foo 2>&1`" = "SYSTEM: echo Installing foo" ]
-[ "`./modprobe bar 2>&1`" = "SYSTEM: echo Installing bar" ]
-[ "`./modprobe baz 2>&1`" = "SYSTEM: echo Installing baz" ]
-[ "`./modprobe -r foo 2>&1`" = "SYSTEM: echo Removing foo" ]
-[ "`./modprobe -r bar 2>&1`" = "SYSTEM: echo Removing bar" ]
-[ "`./modprobe -r baz 2>&1`" = "SYSTEM: echo Removing baz" ]
+[ "`modprobe foo 2>&1`" = "SYSTEM: echo Installing foo" ]
+[ "`modprobe bar 2>&1`" = "SYSTEM: echo Installing bar" ]
+[ "`modprobe baz 2>&1`" = "SYSTEM: echo Installing baz" ]
+[ "`modprobe -r foo 2>&1`" = "SYSTEM: echo Removing foo" ]
+[ "`modprobe -r bar 2>&1`" = "SYSTEM: echo Removing bar" ]
+[ "`modprobe -r baz 2>&1`" = "SYSTEM: echo Removing baz" ]

# Test install & remove of a what is also a real module.
-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep" ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Removing export_nodep" ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep" ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Removing export_nodep" ]

# Test install & remove of what is also a real module via dependency.
-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep" ]
-[ "`./modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
SYSTEM: echo Removing export_nodep" ]

# Test ignoring install & remove: only effects commandline.
-[ "`./modprobe -i noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe -i noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep" ]
-[ "`./modprobe -r -i noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r -i noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
SYSTEM: echo Removing export_nodep" ]

# Test options
-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep" ]
-[ "`./modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep OPTIONS" ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep" ]
+[ "`modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep OPTIONS" ]

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep" ]
-[ "`./modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep OPTIONS" ]

-[ "`./modprobe export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep" ]
-[ "`./modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep OPTIONS" ]

-[ "`./modprobe noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep" ]
-[ "`./modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep OPTIONS" ]

# Test aliases doing insertion.
-[ "`./modprobe alias_to_noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep" ]
-[ "`./modprobe alias_to_noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep OPTIONS" ]
+[ "`modprobe alias_to_noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep" ]
+[ "`modprobe alias_to_noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep OPTIONS" ]

-[ "`./modprobe alias_to_noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep I am alias to noexport_dep" ]
-[ "`./modprobe alias_to_noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep I am alias to noexport_dep OPTIONS" ]

-[ "`./modprobe alias_to_export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep I am alias to export_dep" ]
-[ "`./modprobe alias_to_export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep I am alias to export_dep OPTIONS" ]

-[ "`./modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep I am alias to noexport_doubledep" ]
-[ "`./modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep I am alias to noexport_doubledep" ]
-[ "`./modprobe alias_to_noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
+[ "`modprobe alias_to_noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep I am alias to noexport_doubledep OPTIONS" ]

-[ "`./modprobe alias_to_foo 2>&1`" = "SYSTEM: echo Installing foo" ]
-[ "`./modprobe alias_to_bar 2>&1`" = "SYSTEM: echo Installing bar" ]
-[ "`./modprobe alias_to_baz 2>&1`" = "SYSTEM: echo Installing baz" ]
+[ "`modprobe alias_to_foo 2>&1`" = "SYSTEM: echo Installing foo" ]
+[ "`modprobe alias_to_bar 2>&1`" = "SYSTEM: echo Installing bar" ]
+[ "`modprobe alias_to_baz 2>&1`" = "SYSTEM: echo Installing baz" ]

# Test tab-to-spaces conversion, and \ wrapping.
-[ "`./modprobe alias_to_noexport_nodep-$BITNESS_with_tabbed_options 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep index=0 id=\"Thinkpad\" isapnp=0  port=0x530 cport=0x538 fm_port=0x388  mpu_port=-1 mpu_irq=-1  irq=9 dma1=1 dma2=3  enable=1 isapnp=0" ]
+[ "`modprobe alias_to_noexport_nodep-$BITNESS_with_tabbed_options 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep index=0 id=\"Thinkpad\" isapnp=0  port=0x530 cport=0x538 fm_port=0x388  mpu_port=-1 mpu_irq=-1  irq=9 dma1=1 dma2=3  enable=1 isapnp=0" ]

# Test aliases doing removal.
-[ "`./modprobe -r alias_to_noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r alias_to_noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r alias_to_noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r alias_to_noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
SYSTEM: echo Removing export_nodep" ]
-[ "`./modprobe -r alias_to_export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
+[ "`modprobe -r alias_to_export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
SYSTEM: echo Removing export_nodep" ]
-[ "`./modprobe -r alias_to_noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
+[ "`modprobe -r alias_to_noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
DELETE_MODULE: export_dep_$BITNESS EXCL 
SYSTEM: echo Removing export_nodep" ]

-[ "`./modprobe -r alias_to_foo 2>&1`" = "SYSTEM: echo Removing foo" ]
-[ "`./modprobe -r alias_to_bar 2>&1`" = "SYSTEM: echo Removing bar" ]
-[ "`./modprobe -r alias_to_baz 2>&1`" = "SYSTEM: echo Removing baz" ]
+[ "`modprobe -r alias_to_foo 2>&1`" = "SYSTEM: echo Removing foo" ]
+[ "`modprobe -r alias_to_bar 2>&1`" = "SYSTEM: echo Removing bar" ]
+[ "`modprobe -r alias_to_baz 2>&1`" = "SYSTEM: echo Removing baz" ]
diff --git a/tests/test-modprobe/06rename.sh b/tests/test-modprobe/06rename.sh
index 5692294..3b575d8 100755
--- a/tests/test-modprobe/06rename.sh
+++ b/tests/test-modprobe/06rename.sh
@@ -22,76 +22,76 @@ echo "/lib/modules/$MODTEST_UNAME/rename-new-$BITNESS.ko:" >> $MODULE_DIR/module
echo "/lib/modules/$MODTEST_UNAME/rename-old-$BITNESS.ko:" >> $MODULE_DIR/modules.dep

# Test old-style module 
-[ "`./modprobe rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
strings tests/tmp/out | grep -q 'rename_old'
if strings tests/tmp/out | grep -q 'short'; then exit 1; fi

-[ "`./modprobe -o short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe -o very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

-[ "`./modprobe -o short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe -o very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

-[ "`./modprobe --name short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe --name very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

-[ "`./modprobe --name=short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name=short rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe --name=very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name=very_very_long_name rename-old-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_old'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

# Test new-style module 
-[ "`./modprobe rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
strings tests/tmp/out | grep -q 'rename_new'
if strings tests/tmp/out | grep -q 'short'; then exit 1; fi

-[ "`./modprobe -o short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe -o very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

-[ "`./modprobe -o short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe -o very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe -o very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

-[ "`./modprobe --name short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe --name very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

-[ "`./modprobe --name=short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name=short rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'short'

-[ "`./modprobe --name=very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --name=very_very_long_name rename-new-$BITNESS 2> tests/tmp/out`" = "" ]
if strings tests/tmp/out | grep -q 'rename_new'; then exit 1; fi
strings tests/tmp/out | grep -q 'very_very_long_name'

diff --git a/tests/test-modprobe/07wildalias.sh b/tests/test-modprobe/07wildalias.sh
index 6020141..9be53b7 100755
--- a/tests/test-modprobe/07wildalias.sh
+++ b/tests/test-modprobe/07wildalias.sh
@@ -17,11 +17,11 @@ alias /dev/test* bar
EOF

# Simple test.
-[ "`./modprobe wildcard-_aaa 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe wildcard-_ 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe wildcard_- 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe anotherwildcard-_ 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe anotherwildcard-_aaa 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe /dev/test 2>&1`" = "FATAL: Module bar not found." ]
-[ "`./modprobe /dev/test/tmp 2>&1`" = "FATAL: Module bar not found." ]
-[ "`./modprobe /dev/test7  2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe wildcard-_aaa 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe wildcard-_ 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe wildcard_- 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe anotherwildcard-_ 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe anotherwildcard-_aaa 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe /dev/test 2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe /dev/test/tmp 2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe /dev/test7  2>&1`" = "FATAL: Module bar not found." ]
diff --git a/tests/test-modprobe/09configerrors.sh b/tests/test-modprobe/09configerrors.sh
index 6626618..ab140e9 100755
--- a/tests/test-modprobe/09configerrors.sh
+++ b/tests/test-modprobe/09configerrors.sh
@@ -14,7 +14,7 @@ alias
alias foo
EOF

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'alias'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'alias'
WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'alias'
FATAL: Module foo not found." ]

@@ -24,7 +24,7 @@ options
options foo
EOF

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'options'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'options'
WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'options'
FATAL: Module foo not found." ]

@@ -33,7 +33,7 @@ cat > tests/tmp/etc/modprobe.d/modprobe.conf <<EOF
include
EOF

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'include'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'include'
FATAL: Module foo not found." ]

# Bad install syntax
@@ -42,7 +42,7 @@ install
install foo
EOF

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'install'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'install'
WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'install'
FATAL: Module foo not found." ]

@@ -52,7 +52,7 @@ remove
remove foo
EOF

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'remove'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'remove'
WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
FATAL: Module foo not found." ]

@@ -62,7 +62,7 @@ complete junk and stuff
rubbish
EOF

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'complete'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 1: ignoring bad line starting with 'complete'
WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'rubbish'
FATAL: Module foo not found." ]

@@ -70,32 +70,32 @@ FATAL: Module foo not found." ]
echo "#comment" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "remove" >> tests/tmp/etc/modprobe.d/modprobe.conf

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
FATAL: Module foo not found." ]

echo "" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "remove" >> tests/tmp/etc/modprobe.d/modprobe.conf

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
FATAL: Module foo not found." ]

echo "  # Comment" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "remove" >> tests/tmp/etc/modprobe.d/modprobe.conf

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 2: ignoring bad line starting with 'remove'
FATAL: Module foo not found." ]

echo "  # Comment \\" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "with multiple lines" >> tests/tmp/etc/modprobe.d/modprobe.conf
echo "remove" >> tests/tmp/etc/modprobe.d/modprobe.conf

-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 3: ignoring bad line starting with 'remove'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 3: ignoring bad line starting with 'remove'
FATAL: Module foo not found." ]

echo "remove foo \\" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "  bar" >> tests/tmp/etc/modprobe.d/modprobe.conf
echo "remove" >> tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 3: ignoring bad line starting with 'remove'
+[ "`modprobe foo 2>&1`" = "WARNING: /etc/modprobe.d/modprobe.conf line 3: ignoring bad line starting with 'remove'
FATAL: Module foo not found." ]


diff --git a/tests/test-modprobe/10alias.sh b/tests/test-modprobe/10alias.sh
index 4541aa5..ebe2ea0 100755
--- a/tests/test-modprobe/10alias.sh
+++ b/tests/test-modprobe/10alias.sh
@@ -19,36 +19,36 @@ echo "/lib/modules/$MODTEST_UNAME/kernel/foo.ko:" >> $MODULE_DIR/modules.dep
echo Test > $MODULE_DIR/kernel/foo.ko

# Shouldn't complain if can't open modules.alias
-[ "`./modprobe bar 2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe bar 2>&1`" = "FATAL: Module bar not found." ]

# Now, alias found in modules.alias works.
echo "alias bar alias-$BITNESS" > $MODULE_DIR/modules.alias
-[ "`./modprobe bar 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe bar 2>&1`" = "INIT_MODULE: $SIZE " ]

# Normal alias should override it.
mkdir -p tests/tmp/etc/modprobe.d
echo 'alias bar foo' > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]
+[ "`modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]

# If there's a real module, alias from modules.alias must NOT override.
echo "alias foo alias-$BITNESS" > $MODULE_DIR/modules.alias
-[ "`./modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]
+[ "`modprobe foo 2>&1`" = "INIT_MODULE: 5 " ]

# If there's an install command, modules.alias must not override.
echo 'install bar echo foo' > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe bar 2>&1`" = "SYSTEM: echo foo" ]
+[ "`modprobe bar 2>&1`" = "SYSTEM: echo foo" ]
echo 'remove bar echo foo remove' > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe -r bar 2>&1`" = "SYSTEM: echo foo remove" ]
+[ "`modprobe -r bar 2>&1`" = "SYSTEM: echo foo remove" ]

# Should gather up options from other alias name as well.
echo "alias bar alias-$BITNESS" > $MODULE_DIR/modules.alias
echo "options bar option1" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "options alias-$BITNESS option2" >> tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe bar 2>&1`" = "INIT_MODULE: $SIZE option2 option1" ]
+[ "`modprobe bar 2>&1`" = "INIT_MODULE: $SIZE option2 option1" ]

# Duplicated alias: both get probed (either order)
echo "alias bar foo" >> $MODULE_DIR/modules.alias
-OUT="`./modprobe bar 2>&1`"
+OUT="`modprobe bar 2>&1`"

[ "$OUT" = "INIT_MODULE: $SIZE option2 option1
INIT_MODULE: 5 option1" ] || [ "$OUT" = "INIT_MODULE: 5 option1
diff --git a/tests/test-modprobe/11stripversions.sh b/tests/test-modprobe/11stripversions.sh
index f14b1a5..754705b 100755
--- a/tests/test-modprobe/11stripversions.sh
+++ b/tests/test-modprobe/11stripversions.sh
@@ -25,20 +25,20 @@ echo "# A comment" > $MODULE_DIR/modules.dep
echo "/lib/modules/$MODTEST_UNAME/rename-version-$BITNESS.ko:" >> $MODULE_DIR/modules.dep

# Check it without removing.
-[ "`./modprobe rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
[ "`section_attributes tests/tmp/out __versions`" = "__versions A" ]
[ "`section_attributes tests/tmp/out __vermagic`" = "__vermagic A" ]

# Now remove them (turns off ALLOC bit)
-[ "`./modprobe --force rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --force rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
[ "`section_attributes tests/tmp/out __versions`" = "__versions 0" ]
[ "`section_attributes tests/tmp/out __vermagic`" = "__vermagic 0" ]

# Now remove them individually instead.
-[ "`./modprobe --force-vermagic rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --force-vermagic rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
[ "`section_attributes tests/tmp/out __versions`" = "__versions A" ]
[ "`section_attributes tests/tmp/out __vermagic`" = "__vermagic 0" ]
-[ "`./modprobe --force-modversion rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
+[ "`modprobe --force-modversion rename-version-$BITNESS 2> tests/tmp/out`" = "" ]
[ "`section_attributes tests/tmp/out __versions`" = "__versions 0" ]
[ "`section_attributes tests/tmp/out __vermagic`" = "__vermagic A" ]

diff --git a/tests/test-modprobe/12whitespace.sh b/tests/test-modprobe/12whitespace.sh
index 030561f..159c4c2 100755
--- a/tests/test-modprobe/12whitespace.sh
+++ b/tests/test-modprobe/12whitespace.sh
@@ -7,17 +7,17 @@ rm -rf tests/tmp/*

# Simple dump out test.
touch tests/tmp/empty
-[ "`./modprobe -C /empty -c 2>&1`" = "" ]
-[ "`./modprobe --config /empty --showconfig 2>&1`" = "" ]
+[ "`modprobe -C /empty -c 2>&1`" = "" ]
+[ "`modprobe --config /empty --showconfig 2>&1`" = "" ]

# Explicitly mentioned config files must exist.
-[ "`./modprobe -C FILE-WHICH-DOESNT-EXIST foo 2>&1`" = "FATAL: Failed to open config file FILE-WHICH-DOESNT-EXIST: No such file or directory" ]
+[ "`modprobe -C FILE-WHICH-DOESNT-EXIST foo 2>&1`" = "FATAL: Failed to open config file FILE-WHICH-DOESNT-EXIST: No such file or directory" ]

MODULE_DIR=tests/tmp/lib/modules/$MODTEST_UNAME
mkdir -p $MODULE_DIR
touch $MODULE_DIR/modules.dep

-[ "`./modprobe foo 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe foo 2>&1`" = "FATAL: Module foo not found." ]

# Create a simple config file.
mkdir -p tests/tmp/etc/modprobe.d
@@ -84,96 +84,96 @@ SIZE_NOEXPORT_DOUBLEDEP=`wc -c < tests/data/$BITNESS/normal/noexport_doubledep-$

# Test ignoring install & remove.

-[ "`./modprobe --ignore-install export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe -i export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
-[ "`./modprobe -i foo 2>&1`" = "FATAL: Module foo not found." ]
-[ "`./modprobe -r --ignore-remove export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r -i export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -i -r foo 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe --ignore-install export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe -i export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP " ]
+[ "`modprobe -i foo 2>&1`" = "FATAL: Module foo not found." ]
+[ "`modprobe -r --ignore-remove export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r -i export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
+[ "`modprobe -i -r foo 2>&1`" = "FATAL: Module foo not found." ]

# Test install & remove (fake modules)
-[ "`./modprobe foo 2>&1`" = "SYSTEM: echo Installing   foo" ]
-[ "`./modprobe bar 2>&1`" = "SYSTEM: echo Installing   bar" ]
-[ "`./modprobe baz 2>&1`" = "SYSTEM: echo Installing   baz" ]
-[ "`./modprobe -r foo 2>&1`" = "SYSTEM: echo Removing   foo" ]
-[ "`./modprobe -r bar 2>&1`" = "SYSTEM: echo Removing   bar" ]
-[ "`./modprobe -r baz 2>&1`" = "SYSTEM: echo Removing   baz" ]
+[ "`modprobe foo 2>&1`" = "SYSTEM: echo Installing   foo" ]
+[ "`modprobe bar 2>&1`" = "SYSTEM: echo Installing   bar" ]
+[ "`modprobe baz 2>&1`" = "SYSTEM: echo Installing   baz" ]
+[ "`modprobe -r foo 2>&1`" = "SYSTEM: echo Removing   foo" ]
+[ "`modprobe -r bar 2>&1`" = "SYSTEM: echo Removing   bar" ]
+[ "`modprobe -r baz 2>&1`" = "SYSTEM: echo Removing   baz" ]

# Test install & remove of a what is also a real module.
-[ "`./modprobe export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep" ]
-[ "`./modprobe -r export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Removing   export_nodep" ]
+[ "`modprobe export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep" ]
+[ "`modprobe -r export_nodep-$BITNESS 2>&1`" = "SYSTEM: echo Removing   export_nodep" ]

# Test install & remove of what is also a real module via dependency.
-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep" ]
-[ "`./modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
SYSTEM: echo Removing   export_nodep" ]

# Test ignoring install & remove: only effects commandline.
-[ "`./modprobe -i noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe -i noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep" ]
-[ "`./modprobe -r -i noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r -i noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
SYSTEM: echo Removing   export_nodep" ]

# Test options
-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep" ]
-[ "`./modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep OPTIONS" ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep" ]
+[ "`modprobe noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep OPTIONS" ]

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep" ]
-[ "`./modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep OPTIONS" ]

-[ "`./modprobe export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep" ]
-[ "`./modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep OPTIONS" ]

-[ "`./modprobe noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep" ]
-[ "`./modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep OPTIONS" ]

# Test aliases doing insertion.
-[ "`./modprobe alias_to_noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep" ]
-[ "`./modprobe alias_to_noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep OPTIONS" ]
+[ "`modprobe alias_to_noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep" ]
+[ "`modprobe alias_to_noexport_nodep-$BITNESS OPTIONS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP I am noexport_nodep I am alias to noexport_nodep OPTIONS" ]

-[ "`./modprobe alias_to_noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_noexport_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep I am alias to noexport_dep" ]
-[ "`./modprobe alias_to_noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_noexport_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_NOEXPORT_DEP I am noexport_dep I am alias to noexport_dep OPTIONS" ]

-[ "`./modprobe alias_to_export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_export_dep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep I am alias to export_dep" ]
-[ "`./modprobe alias_to_export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_export_dep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep I am alias to export_dep OPTIONS" ]

-[ "`./modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep I am alias to noexport_doubledep" ]
-[ "`./modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_noexport_doubledep-$BITNESS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep I am alias to noexport_doubledep" ]
-[ "`./modprobe alias_to_noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
+[ "`modprobe alias_to_noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "SYSTEM: echo Installing   export_nodep
INIT_MODULE: $SIZE_EXPORT_DEP I am export_dep
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP I am noexport_doubledep I am alias to noexport_doubledep OPTIONS" ]

-[ "`./modprobe alias_to_foo 2>&1`" = "SYSTEM: echo Installing   foo" ]
-[ "`./modprobe alias_to_bar 2>&1`" = "SYSTEM: echo Installing   bar" ]
-[ "`./modprobe alias_to_baz 2>&1`" = "SYSTEM: echo Installing   baz" ]
+[ "`modprobe alias_to_foo 2>&1`" = "SYSTEM: echo Installing   foo" ]
+[ "`modprobe alias_to_bar 2>&1`" = "SYSTEM: echo Installing   bar" ]
+[ "`modprobe alias_to_baz 2>&1`" = "SYSTEM: echo Installing   baz" ]

# Test aliases doing removal.
-[ "`./modprobe -r alias_to_noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
-[ "`./modprobe -r alias_to_noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
+[ "`modprobe -r alias_to_noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r alias_to_noexport_dep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_dep_$BITNESS EXCL 
SYSTEM: echo Removing   export_nodep" ]
-[ "`./modprobe -r alias_to_export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
+[ "`modprobe -r alias_to_export_dep-$BITNESS 2>&1`" = "DELETE_MODULE: export_dep_$BITNESS EXCL 
SYSTEM: echo Removing   export_nodep" ]
-[ "`./modprobe -r alias_to_noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
+[ "`modprobe -r alias_to_noexport_doubledep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_doubledep_$BITNESS EXCL 
DELETE_MODULE: export_dep_$BITNESS EXCL 
SYSTEM: echo Removing   export_nodep" ]

-[ "`./modprobe -r alias_to_foo 2>&1`" = "SYSTEM: echo Removing   foo" ]
-[ "`./modprobe -r alias_to_bar 2>&1`" = "SYSTEM: echo Removing   bar" ]
-[ "`./modprobe -r alias_to_baz 2>&1`" = "SYSTEM: echo Removing   baz" ]
+[ "`modprobe -r alias_to_foo 2>&1`" = "SYSTEM: echo Removing   foo" ]
+[ "`modprobe -r alias_to_bar 2>&1`" = "SYSTEM: echo Removing   bar" ]
+[ "`modprobe -r alias_to_baz 2>&1`" = "SYSTEM: echo Removing   baz" ]
diff --git a/tests/test-modprobe/13dryrun.sh b/tests/test-modprobe/13dryrun.sh
index c88bb70..04552d6 100755
--- a/tests/test-modprobe/13dryrun.sh
+++ b/tests/test-modprobe/13dryrun.sh
@@ -25,26 +25,26 @@ export_nodep-$BITNESS.ko:
export_dep-$BITNESS.ko: export_nodep-$BITNESS.ko
EOF

-[ "`./modprobe -v -n noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
-[ "`./modprobe -v -n noexport_nodep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko OPTIONS" ]
+[ "`modprobe -v -n noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
+[ "`modprobe -v -n noexport_nodep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko OPTIONS" ]

-[ "`./modprobe -v -n export_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
-[ "`./modprobe -v -n export_nodep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko OPTIONS" ]
+[ "`modprobe -v -n export_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
+[ "`modprobe -v -n export_nodep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko OPTIONS" ]

-[ "`./modprobe -v -n noexport_dep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n noexport_dep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko " ]
-[ "`./modprobe -v -n noexport_dep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n noexport_dep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko OPTIONS" ]

-[ "`./modprobe -v -n export_dep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n export_dep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko " ]
-[ "`./modprobe -v -n export_dep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n export_dep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko OPTIONS" ]

-[ "`./modprobe -v -n noexport_doubledep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n noexport_doubledep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko " ]
-[ "`./modprobe -v -n noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n noexport_doubledep-$BITNESS OPTIONS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko OPTIONS" ]

@@ -52,7 +52,7 @@ insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko OPTIONS" ]
mkdir -p tests/tmp/etc/modprobe.d
echo "alias foo noexport_doubledep-$BITNESS" > tests/tmp/etc/modprobe.d/modprobe.conf
echo "options noexport_doubledep-$BITNESS OPTIONS" >> tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe -v -n foo 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v -n foo 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko OPTIONS" ]

@@ -70,12 +70,12 @@ echo live > tests/tmp/sys/module/export_dep_$BITNESS/initstate
echo live > tests/tmp/sys/module/noexport_doubledep_$BITNESS/initstate

# Removal
-[ "`./modprobe -v -n -r noexport_nodep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko" ]
-[ "`./modprobe -v -n -r export_nodep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko" ]
-[ "`./modprobe -v -n -r noexport_dep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko
+[ "`modprobe -v -n -r noexport_nodep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko" ]
+[ "`modprobe -v -n -r export_nodep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko" ]
+[ "`modprobe -v -n -r noexport_dep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko
rmmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko" ]
-[ "`./modprobe -v -n -r export_dep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko
+[ "`modprobe -v -n -r export_dep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko
rmmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko" ]
-[ "`./modprobe -v -n -r noexport_doubledep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko
+[ "`modprobe -v -n -r noexport_doubledep-$BITNESS 2>&1`" = "rmmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko
rmmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko
rmmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko" ]
diff --git a/tests/test-modprobe/15env.sh b/tests/test-modprobe/15env.sh
index 9be19d3..461e34a 100755
--- a/tests/test-modprobe/15env.sh
+++ b/tests/test-modprobe/15env.sh
@@ -13,44 +13,44 @@ ln tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko \
echo /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko: > $MODULE_DIR/modules.dep

mkdir -p tests/tmp/etc/modprobe.d
-echo install foo ./modprobe noexport_nodep-$BITNESS > tests/tmp/etc/modprobe.d/modprobe.conf
-echo install foo ./modprobe bar > tests/tmp/etc/modprobe2.conf
+echo install foo modprobe noexport_nodep-$BITNESS > tests/tmp/etc/modprobe.d/modprobe.conf
+echo install foo modprobe bar > tests/tmp/etc/modprobe2.conf
echo install bar echo DOING BAR >> tests/tmp/etc/modprobe2.conf

SIZE_NOEXPORT_NODEP=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`

# Test normal args, then in env.
-[ "`./modprobe -v noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko 
+[ "`modprobe -v noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko 
INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`MODPROBE_OPTIONS=-v ./modprobe noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko 
+[ "`MODPROBE_OPTIONS=-v modprobe noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko 
INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]

-[ "`./modprobe -q noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`MODPROBE_OPTIONS=-q ./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
+[ "`modprobe -q noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
+[ "`MODPROBE_OPTIONS=-q modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]

-[ "`./modprobe -n noexport_nodep-$BITNESS 2>&1`" = "" ]
-[ "`MODPROBE_OPTIONS=-n ./modprobe noexport_nodep-$BITNESS 2>&1`" = "" ]
+[ "`modprobe -n noexport_nodep-$BITNESS 2>&1`" = "" ]
+[ "`MODPROBE_OPTIONS=-n modprobe noexport_nodep-$BITNESS 2>&1`" = "" ]

-[ "`./modprobe -n -v noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
-[ "`MODPROBE_OPTIONS="-n -v" ./modprobe noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
+[ "`modprobe -n -v noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
+[ "`MODPROBE_OPTIONS="-n -v" modprobe noexport_nodep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]

# Test argument inheritence.
MODTEST_DO_SYSTEM=1
export MODTEST_DO_SYSTEM

-[ "`./modprobe -v foo 2>&1`" = "install ./modprobe noexport_nodep-$BITNESS
+[ "`modprobe -v foo 2>&1`" = "install modprobe noexport_nodep-$BITNESS
insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko 
INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]
-[ "`MODPROBE_OPTIONS=-v ./modprobe foo 2>&1`" = "install ./modprobe noexport_nodep-$BITNESS
+[ "`MODPROBE_OPTIONS=-v modprobe foo 2>&1`" = "install modprobe noexport_nodep-$BITNESS
insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko 
INIT_MODULE: $SIZE_NOEXPORT_NODEP " ]

-[ "`./modprobe -C /etc/modprobe2.conf foo 2>&1`" = "DOING BAR" ]
-[ "`MODPROBE_OPTIONS='-C /etc/modprobe2.conf' ./modprobe foo 2>&1`" = "DOING BAR" ]
+[ "`modprobe -C /etc/modprobe2.conf foo 2>&1`" = "DOING BAR" ]
+[ "`MODPROBE_OPTIONS='-C /etc/modprobe2.conf' modprobe foo 2>&1`" = "DOING BAR" ]

-[ "`./modprobe -C /etc/modprobe2.conf -v foo 2>&1`" = "install ./modprobe bar
+[ "`modprobe -C /etc/modprobe2.conf -v foo 2>&1`" = "install modprobe bar
install echo DOING BAR
DOING BAR" ]
-[ "`MODPROBE_OPTIONS='-C /etc/modprobe2.conf' ./modprobe -v foo 2>&1`" = "install ./modprobe bar
+[ "`MODPROBE_OPTIONS='-C /etc/modprobe2.conf' modprobe -v foo 2>&1`" = "install modprobe bar
install echo DOING BAR
DOING BAR" ]
diff --git a/tests/test-modprobe/16showdepends.sh b/tests/test-modprobe/16showdepends.sh
index 9106136..1d7b00c 100755
--- a/tests/test-modprobe/16showdepends.sh
+++ b/tests/test-modprobe/16showdepends.sh
@@ -25,13 +25,13 @@ cat > $MODULE_DIR/modules.dep <<EOF
/lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko: /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko
EOF

-[ "`./modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
+[ "`modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
+[ "`modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko " ]

@@ -45,13 +45,13 @@ mkdir -p tests/tmp/sys/module/export_nodep_$BITNESS
echo live > tests/tmp/sys/module/noexport_nodep_$BITNESS/initstate
echo live > tests/tmp/sys/module/export_nodep_$BITNESS/initstate

-[ "`./modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko " ]
+[ "`modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko " ]
+[ "`modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko " ]
-[ "`./modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko " ]

@@ -68,13 +68,13 @@ install export_dep-$BITNESS echo export_dep-$BITNESS
install noexport_doubledep-$BITNESS echo noexport_doubledep-$BITNESS
EOF

-[ "`./modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "install echo noexport_nodep-$BITNESS" ]
-[ "`./modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS" ]
-[ "`./modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS
+[ "`modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "install echo noexport_nodep-$BITNESS" ]
+[ "`modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS" ]
+[ "`modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS
install echo noexport_dep-$BITNESS" ]
-[ "`./modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS
+[ "`modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS
install echo export_dep-$BITNESS" ]
-[ "`./modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS
+[ "`modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "install echo export_nodep-$BITNESS
install echo export_dep-$BITNESS
install echo noexport_doubledep-$BITNESS" ]
# Nothing in stderr...
@@ -89,13 +89,13 @@ options export_dep-$BITNESS opt4
options noexport_doubledep-$BITNESS opt5
EOF

-[ "`./modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko opt1" ]
-[ "`./modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2" ]
-[ "`./modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2
+[ "`modprobe --show-depends noexport_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko opt1" ]
+[ "`modprobe --show-depends export_nodep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2" ]
+[ "`modprobe --show-depends noexport_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2
insmod /lib/modules/$MODTEST_UNAME/noexport_dep-$BITNESS.ko opt3" ]
-[ "`./modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2
+[ "`modprobe --show-depends export_dep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko opt4" ]
-[ "`./modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2
+[ "`modprobe --show-depends noexport_doubledep-$BITNESS 2>>tests/tmp/stderr`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko opt2
insmod /lib/modules/$MODTEST_UNAME/export_dep-$BITNESS.ko opt4
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko opt5" ]
# Nothing in stderr...
@@ -108,6 +108,6 @@ alias foo noexport_nodep-$BITNESS
options foo fooopt
EOF

-[ "`./modprobe --show-depends foo`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko opt1 fooopt" ]
+[ "`modprobe --show-depends foo`" = "insmod /lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko opt1 fooopt" ]
# Nothing in stderr...
[ `wc -c < tests/tmp/stderr` = 0 ]
diff --git a/tests/test-modprobe/17compressed.sh b/tests/test-modprobe/17compressed.sh
index 7d07f4e..e3c6fe2 100755
--- a/tests/test-modprobe/17compressed.sh
+++ b/tests/test-modprobe/17compressed.sh
@@ -22,14 +22,14 @@ echo "/lib/modules/$MODTEST_UNAME/noexport_nodep-$BITNESS.ko.gz:" >> $MODULE_DIR
SIZE=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`

# No args
-[ "`./modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]

# With args
-[ "`./modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]

# Check underscore equivalence.
-[ "`./modprobe noexport-nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
-[ "`./modprobe noexport-nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
-[ "`./modprobe noexport_nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport-nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport-nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep_$BITNESS foo=\"bar baz\" 2>&1`" = "INIT_MODULE: $SIZE foo=\"bar baz\"" ]

done
diff --git a/tests/test-modprobe/18multiremove.sh b/tests/test-modprobe/18multiremove.sh
index 2d0ed48..296536d 100755
--- a/tests/test-modprobe/18multiremove.sh
+++ b/tests/test-modprobe/18multiremove.sh
@@ -39,5 +39,5 @@ echo live > tests/tmp/sys/module/export_dep_$BITNESS/initstate
echo live > tests/tmp/sys/module/noexport_doubledep_$BITNESS/initstate

# Removal
-[ "`./modprobe -r noexport_nodep-$BITNESS export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL 
+[ "`modprobe -r noexport_nodep-$BITNESS export_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL 
DELETE_MODULE: export_nodep_$BITNESS EXCL " ]
diff --git a/tests/test-modprobe/19quiet.sh b/tests/test-modprobe/19quiet.sh
index 926968b..da96580 100755
--- a/tests/test-modprobe/19quiet.sh
+++ b/tests/test-modprobe/19quiet.sh
@@ -15,37 +15,37 @@ echo "noexport_nodep-$BITNESS.ko:" >> $MODULE_DIR/modules.dep
echo "bogus-$BITNESS.ko:" >> $MODULE_DIR/modules.dep

mkdir -p tests/tmp/etc/modprobe.d
-echo "install some-command ./modprobe crap && echo SUCCESS" > tests/tmp/etc/modprobe.d/modprobe.conf 
-echo "remove some-command ./modprobe -r crap && echo SUCCESS" >> tests/tmp/etc/modprobe.d/modprobe.conf 
+echo "install some-command modprobe crap && echo SUCCESS" > tests/tmp/etc/modprobe.d/modprobe.conf 
+echo "remove some-command modprobe -r crap && echo SUCCESS" >> tests/tmp/etc/modprobe.d/modprobe.conf 
echo "alias foobar crap" >> tests/tmp/etc/modprobe.d/modprobe.conf 

SIZE=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`

# -q works as normal.
-[ "`./modprobe -q noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe -q noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE " ]

# -q on non-existent fail, quietly.
-[ "`./modprobe -q crap 2>&1`" = "" ]
-if ./modprobe -q crap; then exit 1; fi
+[ "`modprobe -q crap 2>&1`" = "" ]
+if modprobe -q crap; then exit 1; fi

# -q on alias to non-existent succeeds, quietly.
-[ "`./modprobe -q foobar 2>&1`" = "" ]
-if ./modprobe -q foobar; then exit 1; fi
+[ "`modprobe -q foobar 2>&1`" = "" ]
+if modprobe -q foobar; then exit 1; fi

# -q on some other problem gives errors.
-[ "`./modprobe -q bogus-$BITNESS 2>&1`" != "" ]
-if ./modprobe -q bogus-$BITNESS 2>/dev/null; then exit 1; fi
+[ "`modprobe -q bogus-$BITNESS 2>&1`" != "" ]
+if modprobe -q bogus-$BITNESS 2>/dev/null; then exit 1; fi

MODTEST_DO_SYSTEM=1
export MODTEST_DO_SYSTEM
# Normal install command will fail.
-[ "`./modprobe some-command 2>&1`" = "FATAL: Module crap not found.
+[ "`modprobe some-command 2>&1`" = "FATAL: Module crap not found.
FATAL: Error running install command for some_command" ]
-if ./modprobe some-command 2>/dev/null; then exit 1; fi
+if modprobe some-command 2>/dev/null; then exit 1; fi

# -q doesn't cause "modprobe crap" to succeed, but is passed through install.
-[ "`./modprobe -q some-command 2>&1`" = "FATAL: Error running install command for some_command" ]
-if ./modprobe -q some-command 2>/dev/null; then exit 1; fi
+[ "`modprobe -q some-command 2>&1`" = "FATAL: Error running install command for some_command" ]
+if modprobe -q some-command 2>/dev/null; then exit 1; fi

# Now make a fake /sys/module structure for the test
mkdir -p tests/tmp/sys/module
@@ -61,19 +61,19 @@ echo live > tests/tmp/sys/module/export_dep_$BITNESS/initstate
echo live > tests/tmp/sys/module/noexport_doubledep_$BITNESS/initstate

# -q works as normal.
-[ "`./modprobe -r -q noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]
+[ "`modprobe -r -q noexport_nodep-$BITNESS 2>&1`" = "DELETE_MODULE: noexport_nodep_$BITNESS EXCL " ]

# -q on non-existent module fails, silently.
-[ "`./modprobe -r -q crap 2>&1`" = "" ]
-if ./modprobe -r -q crap; then exit 1; fi
+[ "`modprobe -r -q crap 2>&1`" = "" ]
+if modprobe -r -q crap; then exit 1; fi

MODTEST_DO_SYSTEM=1
export MODTEST_DO_SYSTEM
# Normal remove command will fail.
-[ "`./modprobe -r some-command 2>&1`" = "FATAL: Module crap not found.
+[ "`modprobe -r some-command 2>&1`" = "FATAL: Module crap not found.
FATAL: Error running remove command for some_command" ]
-if ./modprobe -r some-command 2>/dev/null; then exit 1; fi
+if modprobe -r some-command 2>/dev/null; then exit 1; fi

# -q doesn't cause "modprobe -r crap" to succeed, but silences it.
-[ "`./modprobe -r -q some-command 2>&1`" = "FATAL: Error running remove command for some_command" ]
-if ./modprobe -r -q some-command 2>/dev/null; then exit 1; fi
+[ "`modprobe -r -q some-command 2>&1`" = "FATAL: Error running remove command for some_command" ]
+if modprobe -r -q some-command 2>/dev/null; then exit 1; fi
diff --git a/tests/test-modprobe/20oldstyle.sh b/tests/test-modprobe/20oldstyle.sh
index 299c7ba..5e898dc 100755
--- a/tests/test-modprobe/20oldstyle.sh
+++ b/tests/test-modprobe/20oldstyle.sh
@@ -24,48 +24,48 @@ SIZE1=`wc -c < tests/data/$BITNESS/normal/noexport_nodep-$BITNESS.ko`
SIZE2=`wc -c < tests/data/$BITNESS/normal/export_nodep-$BITNESS.ko`

# -l lists all of them (either order)
-[ "`./modprobe -l 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko
+[ "`modprobe -l 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko
/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko" ] ||
-[ "`./modprobe -l 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko
+[ "`modprobe -l 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko
/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]

# -l -t foo lists none of them.
-[ "`./modprobe -l -t foo 2>&1`" = "" ]
+[ "`modprobe -l -t foo 2>&1`" = "" ]

# -l -t type lists all of them (either order)
-[ "`./modprobe -l -t type 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko
+[ "`modprobe -l -t type 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko
/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko" ] ||
-[ "`./modprobe -l -t type 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko
+[ "`modprobe -l -t type 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko
/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]

# -l -t drivers lists one.
-[ "`./modprobe -l -t drivers 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]
+[ "`modprobe -l -t drivers 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]

# -l -t drivers/type lists one.
-[ "`./modprobe -l -t drivers/type 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]
+[ "`modprobe -l -t drivers/type 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]

# -l -t other lists one.
-[ "`./modprobe -l -t other 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko" ]
+[ "`modprobe -l -t other 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko" ]

# -l -t other/type lists one.
-[ "`./modprobe -l -t other/type 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko" ]
+[ "`modprobe -l -t other/type 2>&1`" = "/lib/modules/$MODTEST_UNAME/other/type/export_nodep-$BITNESS.ko" ]

# Wildcard works.
-[ "`./modprobe -l -t type 'noexport-nodep*' 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]
+[ "`modprobe -l -t type 'noexport-nodep*' 2>&1`" = "/lib/modules/$MODTEST_UNAME/drivers/type/noexport_nodep-$BITNESS.ko" ]

# -t type without -l not supported
-./modprobe -t type 2>&1 | grep -q Usage
-./modprobe -a -t type 2>&1 | grep -q Usage
+modprobe -t type 2>&1 | grep -q Usage
+modprobe -a -t type 2>&1 | grep -q Usage

# -a with one arg succeeds.
-[ "`./modprobe -a noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe -a noexport_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
# ... even with - and _ confused.
-[ "`./modprobe -a noexport-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]
+[ "`modprobe -a noexport-nodep_$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 " ]

# With two args succeeds.
-[ "`./modprobe -a noexport_nodep-$BITNESS export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 
+[ "`modprobe -a noexport_nodep-$BITNESS export_nodep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE1 
INIT_MODULE: $SIZE2 " ]

# Does second even if first screws up.
-[ "`./modprobe -a crap export_nodep-$BITNESS 2>&1`" = "WARNING: Module crap not found.
+[ "`modprobe -a crap export_nodep-$BITNESS 2>&1`" = "WARNING: Module crap not found.
INIT_MODULE: $SIZE2 " ]
diff --git a/tests/test-modprobe/21wildinstall.sh b/tests/test-modprobe/21wildinstall.sh
index d580e4c..18b1913 100755
--- a/tests/test-modprobe/21wildinstall.sh
+++ b/tests/test-modprobe/21wildinstall.sh
@@ -19,15 +19,15 @@ remove *wildcard-_* echo removing \$MODPROBE_MODULE.
EOF

# Install...
-[ "`./modprobe wildcard-_aaa 2>&1`" = "installing wildcard__aaa." ]
-[ "`./modprobe wildcard-_ 2>&1`" = "installing wildcard__." ]
-[ "`./modprobe wildcard_- 2>&1`" = "installing wildcard__." ]
-[ "`./modprobe anotherwildcard-_ 2>&1`" = "installing anotherwildcard__." ]
-[ "`./modprobe anotherwildcard-_aaa 2>&1`" = "installing anotherwildcard__aaa." ]
+[ "`modprobe wildcard-_aaa 2>&1`" = "installing wildcard__aaa." ]
+[ "`modprobe wildcard-_ 2>&1`" = "installing wildcard__." ]
+[ "`modprobe wildcard_- 2>&1`" = "installing wildcard__." ]
+[ "`modprobe anotherwildcard-_ 2>&1`" = "installing anotherwildcard__." ]
+[ "`modprobe anotherwildcard-_aaa 2>&1`" = "installing anotherwildcard__aaa." ]

# Remove...
-[ "`./modprobe -r wildcard-_aaa 2>&1`" = "removing wildcard__aaa." ]
-[ "`./modprobe -r wildcard-_ 2>&1`" = "removing wildcard__." ]
-[ "`./modprobe -r wildcard_- 2>&1`" = "removing wildcard__." ]
-[ "`./modprobe -r anotherwildcard-_ 2>&1`" = "removing anotherwildcard__." ]
-[ "`./modprobe -r anotherwildcard-_aaa 2>&1`" = "removing anotherwildcard__aaa." ]
+[ "`modprobe -r wildcard-_aaa 2>&1`" = "removing wildcard__aaa." ]
+[ "`modprobe -r wildcard-_ 2>&1`" = "removing wildcard__." ]
+[ "`modprobe -r wildcard_- 2>&1`" = "removing wildcard__." ]
+[ "`modprobe -r anotherwildcard-_ 2>&1`" = "removing anotherwildcard__." ]
+[ "`modprobe -r anotherwildcard-_aaa 2>&1`" = "removing anotherwildcard__aaa." ]
diff --git a/tests/test-modprobe/22recursiveinstall.sh b/tests/test-modprobe/22recursiveinstall.sh
index 9d4b329..0c98e1a 100755
--- a/tests/test-modprobe/22recursiveinstall.sh
+++ b/tests/test-modprobe/22recursiveinstall.sh
@@ -25,7 +25,7 @@ SIZE_NOEXPORT_DEP=`wc -c < tests/data/$BITNESS/normal/noexport_dep-$BITNESS.ko`
mkdir -p tests/tmp/sys/module

# Check it pulls in both.
-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
INIT_MODULE: $SIZE_NOEXPORT_DEP " ]

# Check it's happy if we tell it dep is already instealled
@@ -33,7 +33,7 @@ mkdir -p tests/tmp/sys/module
mkdir -p tests/tmp/sys/module/export_nodep_$BITNESS
echo "live" >tests/tmp/sys/module/export_nodep_$BITNESS/initstate

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_DEP " ]
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_DEP " ]

# If there's an install command, it will be done.
# Clean up sysfs (so we don't think it's loaded)
@@ -41,7 +41,7 @@ rm -rf tests/tmp/sys

mkdir -p tests/tmp/etc/modprobe.d
echo "install export_nodep-$BITNESS COMMAND" > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: COMMAND
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "SYSTEM: COMMAND
INIT_MODULE: $SIZE_NOEXPORT_DEP " ]

# If it's in /sys/module, install command WONT be done.
@@ -49,7 +49,7 @@ mkdir -p tests/tmp/sys/module
mkdir -p tests/tmp/sys/module/export_nodep_$BITNESS
echo "live" >tests/tmp/sys/module/export_nodep_$BITNESS/initstate

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_DEP " ]
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_NOEXPORT_DEP " ]

# Do dependencies even if install command.
# clean up sysfs (so we don't think it's loaded)
@@ -57,5 +57,5 @@ rm -rf tests/tmp/sys

echo "install noexport_dep-$BITNESS COMMAND" > tests/tmp/etc/modprobe.d/modprobe.conf

-[ "`./modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
+[ "`modprobe noexport_dep-$BITNESS 2>&1`" = "INIT_MODULE: $SIZE_EXPORT_NODEP 
SYSTEM: COMMAND" ]
diff --git a/tests/test-modprobe/23recursive-deps.sh b/tests/test-modprobe/23recursive-deps.sh
index 727a4fd..f425e9b 100755
--- a/tests/test-modprobe/23recursive-deps.sh
+++ b/tests/test-modprobe/23recursive-deps.sh
@@ -32,7 +32,7 @@ echo "live" > tests/tmp/sys/module/export_dep_$BITNESS/initstate
SIZE_EXPORT_NODEP=`wc -c < tests/data/$BITNESS/normal/export_nodep-$BITNESS.ko`
SIZE_NOEXPORT_DOUBLEDEP=`wc -c < tests/data/$BITNESS/normal/noexport_doubledep-$BITNESS.ko`

-[ "`./modprobe -v noexport_doubledep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
+[ "`modprobe -v noexport_doubledep-$BITNESS 2>&1`" = "insmod /lib/modules/$MODTEST_UNAME/export_nodep-$BITNESS.ko 
INIT_MODULE: $SIZE_EXPORT_NODEP 
insmod /lib/modules/$MODTEST_UNAME/noexport_doubledep-$BITNESS.ko 
INIT_MODULE: $SIZE_NOEXPORT_DOUBLEDEP " ]
diff --git a/tests/test-modprobe/26blacklist.sh b/tests/test-modprobe/26blacklist.sh
index 43f47c1..8fcff39 100755
--- a/tests/test-modprobe/26blacklist.sh
+++ b/tests/test-modprobe/26blacklist.sh
@@ -19,24 +19,24 @@ echo Test > $MODULE_DIR/kernel/foo.ko

# First, alias found in modules.alias works.
echo "alias bar alias-$BITNESS" > $MODULE_DIR/modules.alias
-[ "`./modprobe bar 2>&1`" = "INIT_MODULE: $SIZE " ]
+[ "`modprobe bar 2>&1`" = "INIT_MODULE: $SIZE " ]

# Blacklist makes it fail.
mkdir -p tests/tmp/etc/modprobe.d
echo "blacklist alias-$BITNESS" > tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe bar 2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe bar 2>&1`" = "FATAL: Module bar not found." ]

# Blacklist doesn't effect other aliases.
echo "alias bar foo" >> $MODULE_DIR/modules.alias
-[ "`./modprobe bar 2>&1`" = "INIT_MODULE: 5 " ]
+[ "`modprobe bar 2>&1`" = "INIT_MODULE: 5 " ]

# Blacklist both.
echo "blacklist foo" >> tests/tmp/etc/modprobe.d/modprobe.conf
-[ "`./modprobe bar 2>&1`" = "FATAL: Module bar not found." ]
+[ "`modprobe bar 2>&1`" = "FATAL: Module bar not found." ]

# Remove blacklist, all works.
rm -f tests/tmp/etc/modprobe.d/modprobe.conf
-RESULT="`./modprobe bar 2>&1`"
+RESULT="`modprobe bar 2>&1`"
[ "$RESULT" = "INIT_MODULE: $SIZE 
INIT_MODULE: 5 " ] || [ "$RESULT" = "INIT_MODULE: 5 
INIT_MODULE: $SIZE " ]
diff --git a/tests/test-modprobe/27cmdline-install-remove.sh b/tests/test-modprobe/27cmdline-install-remove.sh
index fadaa28..fef02ff 100755
--- a/tests/test-modprobe/27cmdline-install-remove.sh
+++ b/tests/test-modprobe/27cmdline-install-remove.sh
@@ -20,11 +20,11 @@ echo "install noexport_nodep-$BITNESS modprobe --ignore-install noexport_nodep-$
echo "install othertarget echo \$CMDLINE_OPTS otheropts" >> tests/tmp/etc/modprobe.d/modprobe.conf

# With quoted args
-[ "`./modprobe noexport_nodep-$BITNESS 'foo="bar baz"' 2>&1`" = "SYSTEM: modprobe --ignore-install noexport_nodep-$BITNESS foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS 'foo="bar baz"' 2>&1`" = "SYSTEM: modprobe --ignore-install noexport_nodep-$BITNESS foo=\"bar baz\"" ]
# With unquoted args
-[ "`./modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "SYSTEM: modprobe --ignore-install noexport_nodep-$BITNESS foo=\"bar baz\"" ]
+[ "`modprobe noexport_nodep-$BITNESS foo=\"bar baz\" 2>&1`" = "SYSTEM: modprobe --ignore-install noexport_nodep-$BITNESS foo=\"bar baz\"" ]

# Same with other target.
-[ "`./modprobe othertarget 'foo="bar baz"' 2>&1`" = "SYSTEM: echo foo=\"bar baz\" otheropts" ]
+[ "`modprobe othertarget 'foo="bar baz"' 2>&1`" = "SYSTEM: echo foo=\"bar baz\" otheropts" ]
# With unquoted args
-[ "`./modprobe othertarget foo=\"bar baz\" 2>&1`" = "SYSTEM: echo foo=\"bar baz\" otheropts" ]
+[ "`modprobe othertarget foo=\"bar baz\" 2>&1`" = "SYSTEM: echo foo=\"bar baz\" otheropts" ]
diff --git a/tests/test-rmmod/02namefix.sh b/tests/test-rmmod/02namefix.sh
index ef0be36..08eb02e 100755
--- a/tests/test-rmmod/02namefix.sh
+++ b/tests/test-rmmod/02namefix.sh
@@ -5,12 +5,12 @@ mkdir -p tests/tmp/proc
# Old style
echo 'foo_bar 100 0' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]

-[ "`./rmmod /lib/modules/$MODTEST_UNAME/kernel/foo_bar.o`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod /lib/modules/$MODTEST_UNAME/kernel/foo_bar.o`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]

-[ "`./rmmod /lib/modules/$MODTEST_UNAME/kernel/foo_bar.ko`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod /lib/modules/$MODTEST_UNAME/kernel/foo_bar.ko`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]

-[ "`./rmmod /lib/modules/$MODTEST_UNAME/kernel/foo-bar.ko`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod /lib/modules/$MODTEST_UNAME/kernel/foo-bar.ko`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]

-[ "`./rmmod foo-bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo-bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
diff --git a/tests/test-rmmod/03inuse.sh b/tests/test-rmmod/03inuse.sh
index 60d3bd7..5d5ae1a 100755
--- a/tests/test-rmmod/03inuse.sh
+++ b/tests/test-rmmod/03inuse.sh
@@ -5,46 +5,46 @@ mkdir -p tests/tmp/proc
# Old style
echo 'foo_bar 100 1' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use" ]

# Old style with dependencies
echo 'foo_bar 100 1 dep1' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1" ]

echo 'foo_bar 100 1 dep1 dep2' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1 dep2" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1 dep2" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1 dep2" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by dep1 dep2" ]

# New style
echo 'foo_bar 100 1 -' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use" ]

echo 'foo_bar 100 1 a,' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by a" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by a" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by a" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by a" ]

echo 'foo_bar 100 1 a,b,' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]

echo 'foo_bar 100 1 a,b, newoption' > tests/tmp/proc/modules

-[ "`./rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]
-[ "`./rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]
+[ "`rmmod foo_bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]
+[ "`rmmod foo-bar 2>&1`" = "ERROR: Module foo_bar is in use by a,b" ]

# Not in use (newstyle)
echo 'foo_bar 100 0 -' > tests/tmp/proc/modules
-[ "`./rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
-[ "`./rmmod foo-bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo-bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]

echo 'foo_bar 100 0 - newoption' > tests/tmp/proc/modules
-[ "`./rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
-[ "`./rmmod foo-bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo-bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
diff --git a/tests/test-rmmod/04flags.sh b/tests/test-rmmod/04flags.sh
index fa3eea1..e3bdbce 100755
--- a/tests/test-rmmod/04flags.sh
+++ b/tests/test-rmmod/04flags.sh
@@ -5,22 +5,22 @@ mkdir -p tests/tmp/proc
# Old style
echo 'foo_bar 100 0' > tests/tmp/proc/modules

-[ "`./rmmod -f foo_bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
-[ "`./rmmod -f foo-bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+[ "`rmmod -f foo_bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+[ "`rmmod -f foo-bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]

-[ "`./rmmod -f /lib/modules/$MODTEST_UNAME/kernel/foo_bar.o`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
-[ "`./rmmod -f /lib/modules/$MODTEST_UNAME/kernel/foo_bar.ko`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
-[ "`./rmmod -f /lib/modules/$MODTEST_UNAME/kernel/foo-bar.ko`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+[ "`rmmod -f /lib/modules/$MODTEST_UNAME/kernel/foo_bar.o`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+[ "`rmmod -f /lib/modules/$MODTEST_UNAME/kernel/foo_bar.ko`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+[ "`rmmod -f /lib/modules/$MODTEST_UNAME/kernel/foo-bar.ko`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]

-[ "`./rmmod -w foo_bar`" = "DELETE_MODULE: foo_bar EXCL " ]
-[ "`./rmmod -w foo-bar`" = "DELETE_MODULE: foo_bar EXCL " ]
+[ "`rmmod -w foo_bar`" = "DELETE_MODULE: foo_bar EXCL " ]
+[ "`rmmod -w foo-bar`" = "DELETE_MODULE: foo_bar EXCL " ]

-[ "`./rmmod -w /lib/modules/$MODTEST_UNAME/kernel/foo_bar.o`" = "DELETE_MODULE: foo_bar EXCL " ]
-[ "`./rmmod -w /lib/modules/$MODTEST_UNAME/kernel/foo_bar.ko`" = "DELETE_MODULE: foo_bar EXCL " ]
-[ "`./rmmod -w /lib/modules/$MODTEST_UNAME/kernel/foo-bar.ko`" = "DELETE_MODULE: foo_bar EXCL " ]
+[ "`rmmod -w /lib/modules/$MODTEST_UNAME/kernel/foo_bar.o`" = "DELETE_MODULE: foo_bar EXCL " ]
+[ "`rmmod -w /lib/modules/$MODTEST_UNAME/kernel/foo_bar.ko`" = "DELETE_MODULE: foo_bar EXCL " ]
+[ "`rmmod -w /lib/modules/$MODTEST_UNAME/kernel/foo-bar.ko`" = "DELETE_MODULE: foo_bar EXCL " ]

# Both should work on "in-use" modules.
echo 'foo_bar 100 1' > tests/tmp/proc/modules

-[ "`./rmmod -f foo_bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
-[ "`./rmmod -w foo_bar`" = "DELETE_MODULE: foo_bar EXCL " ]
+[ "`rmmod -f foo_bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+[ "`rmmod -w foo_bar`" = "DELETE_MODULE: foo_bar EXCL " ]
diff --git a/tests/test-rmmod/05noproc.sh b/tests/test-rmmod/05noproc.sh
index e5ed2fe..a03c733 100755
--- a/tests/test-rmmod/05noproc.sh
+++ b/tests/test-rmmod/05noproc.sh
@@ -3,15 +3,15 @@
mkdir -p tests/tmp/proc

# We allow this in case proc is not mounted.
-[ "`./rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]
+[ "`rmmod foo_bar`" = "DELETE_MODULE: foo_bar EXCL NONBLOCK " ]

# We don't allow any other errors.  Doesn't work if we're root.
if [ `id -u` -ne 0 ]; then
    touch tests/tmp/proc/modules
    chmod 000 tests/tmp/proc/modules

-    [ "`./rmmod foo_bar 2>&1`" = "FATAL: can't open /proc/modules: Permission denied" ]
+    [ "`rmmod foo_bar 2>&1`" = "FATAL: can't open /proc/modules: Permission denied" ]

    # But -f doesn't care
-    [ "`./rmmod -f foo_bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
+    [ "`rmmod -f foo_bar`" = "DELETE_MODULE: foo_bar EXCL TRUNC NONBLOCK " ]
fi
diff --git a/tests/test-rmmod/06multi.sh b/tests/test-rmmod/06multi.sh
index 5702240..8762eff 100755
--- a/tests/test-rmmod/06multi.sh
+++ b/tests/test-rmmod/06multi.sh
@@ -6,21 +6,21 @@ mkdir -p tests/tmp/proc
echo 'foo 100 0' > tests/tmp/proc/modules
echo 'bar 100 0' >> tests/tmp/proc/modules

-[ "`./rmmod foo bar`" = "DELETE_MODULE: foo EXCL NONBLOCK 
+[ "`rmmod foo bar`" = "DELETE_MODULE: foo EXCL NONBLOCK 
DELETE_MODULE: bar EXCL NONBLOCK " ]

-[ "`./rmmod -f foo bar`" = "DELETE_MODULE: foo EXCL TRUNC NONBLOCK 
+[ "`rmmod -f foo bar`" = "DELETE_MODULE: foo EXCL TRUNC NONBLOCK 
DELETE_MODULE: bar EXCL TRUNC NONBLOCK " ]

-[ "`./rmmod -w foo bar`" = "DELETE_MODULE: foo EXCL 
+[ "`rmmod -w foo bar`" = "DELETE_MODULE: foo EXCL 
DELETE_MODULE: bar EXCL " ]

# First examine stdout (mixing them gives unpredictable results)
-[ "`./rmmod foo bar baz 2>/dev/null`" = "DELETE_MODULE: foo EXCL NONBLOCK 
+[ "`rmmod foo bar baz 2>/dev/null`" = "DELETE_MODULE: foo EXCL NONBLOCK 
DELETE_MODULE: bar EXCL NONBLOCK " ]
-[ "`./rmmod baz foo bar 2>/dev/null`" = "DELETE_MODULE: foo EXCL NONBLOCK 
+[ "`rmmod baz foo bar 2>/dev/null`" = "DELETE_MODULE: foo EXCL NONBLOCK 
DELETE_MODULE: bar EXCL NONBLOCK " ]

# Now examine stderr.
-[ "`./rmmod foo bar baz 2>&1 >/dev/null`" = "ERROR: Module baz does not exist in /proc/modules" ]
-[ "`./rmmod baz foo bar 2>&1 >/dev/null`" = "ERROR: Module baz does not exist in /proc/modules" ]
+[ "`rmmod foo bar baz 2>&1 >/dev/null`" = "ERROR: Module baz does not exist in /proc/modules" ]
+[ "`rmmod baz foo bar 2>&1 >/dev/null`" = "ERROR: Module baz does not exist in /proc/modules" ]
diff --git a/tests/test-rmmod/disabled01backcompat.sh b/tests/test-rmmod/disabled01backcompat.sh
index bfebad1..d607df7 100755
--- a/tests/test-rmmod/disabled01backcompat.sh
+++ b/tests/test-rmmod/disabled01backcompat.sh
@@ -4,7 +4,7 @@ MODTEST_DO_CREATE_MODULE=1
export MODTEST_DO_CREATE_MODULE

# Should fail to run (sys_create_module succeeds), not find rmmod.old.
-[ "`./rmmod 2>&1`" = "Kernel requires old rmmod, but couldn't run ./rmmod.old: No such file or directory" ]
+[ "`rmmod 2>&1`" = "Kernel requires old rmmod, but couldn't run ./rmmod.old: No such file or directory" ]

# Create one for it to find, put it in the path
echo '#! /bin/sh' > tests/tmp/rmmod.old
@@ -14,7 +14,7 @@ chmod a+x tests/tmp/rmmod.old
PATH=`pwd`/tests/tmp:$PATH

# If explicit path given, shouldn't search path.
-[ "`./rmmod 2>&1`" = "Kernel requires old rmmod, but couldn't run ./rmmod.old: No such file or directory" ]
+[ "`rmmod 2>&1`" = "Kernel requires old rmmod, but couldn't run ./rmmod.old: No such file or directory" ]

# No args expected
[ "`rmmod 2>&1`" = "RMMOD.OLD" ]


--
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