Re: [GIT] Clean up option handling

[Andreas Robinson <andr345@xxxxxxxxx>]

On Thu, 2009-06-11 at 16:35 +0100, Alan Jenkins wrote:
> The following changes since commit c6fb42a68462729c4dfda59b8fc5f9c84c58b68b:
>   Jon Masters (1):
>         testsuite: rebuild all the 64-be|le data files
> 
> are available in the git repository at:
> 
>   git@xxxxxxxxxx:sourcejedi/module-init-tools.git master
> 
> or may be reviewed online at:
> 
>   http://github.com/sourcejedi/module-init-tools/commits/master
> 
> Alan Jenkins (8):
>       Re-order options to make the code easier to check
>       Clean up missing options
>       depmod --warn doesn't has_arg
>       modprobe: don't ignore --set-version when preceded by --dirname
>       modprobe: --remove requires at least one module name
>       depmod: simplify option error handling

This one breaks the test suite for me. Other than that it looks good!

$git reset --hard b8c5b894e97aa052ecac1ba6615edadb757a0e82

HEAD is now at b8c5b89 depmod: simplify option error handling

$ tests/runtests 

Building with --enable-zlib...
Testing with --enable-zlib...
Running tests for tests/test-depmod........Test for
tests/test-depmod/10badcommand.sh failed.

$ tests/runtests -vv

[...]
Tests tests/test-depmod/09alias.sh succeeded.
+ depmod --unknown
+ head -1
+ [ depmod: unrecognized option '--unknown' = depmod: unrecognized option `--unknown' ]
Test for tests/test-depmod/10badcommand.sh failed.

This patch fixes it for me:

diff --git a/tests/test-depmod/10badcommand.sh
b/tests/test-depmod/10badcommand.sh
index c03fd9a..8a00121 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: unrecognized option \`--unknown'" ]
+[ "`depmod --unknown 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
 
-[ "`depmod -v --unknown 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
-[ "`depmod --unknown -v 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
+[ "`depmod -v --unknown 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
+[ "`depmod --unknown -v 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
 
-[ "`depmod 2.6.0 --unknown 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
-[ "`depmod --unknown 2.6.0 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
+[ "`depmod 2.6.0 --unknown 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
+[ "`depmod --unknown 2.6.0 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
 
-[ "`depmod -v 2.6.0 --unknown 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
-[ "`depmod -v --unknown 2.6.0 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
+[ "`depmod -v 2.6.0 --unknown 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
+[ "`depmod -v --unknown 2.6.0 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
 
-[ "`depmod 2.6.0 -v --unknown 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
-[ "`depmod --unknown -v 2.6.0 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
+[ "`depmod 2.6.0 -v --unknown 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
+[ "`depmod --unknown -v 2.6.0 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
 
-[ "`depmod 2.6.0 --unknown -v 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
-[ "`depmod --unknown 2.6.0 -v 2>&1 | head -1`" = "depmod: unrecognized option \`--unknown'" ]
+[ "`depmod 2.6.0 --unknown -v 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
+[ "`depmod --unknown 2.6.0 -v 2>&1 | head -1`" = "depmod: unrecognized option '--unknown'" ]
 
 done
 done


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