summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2013-02-10 12:47:23 +0000
committerPádraig Brady <P@draigBrady.com>2013-02-10 20:30:53 +0000
commit3309e880fb2b5d4316809c5ceef4f5b2b8d34a38 (patch)
tree7f55499b883b230b4a8d550e2d340befe2d82e4e /tests
parent71ab11eac1de965e90abf050bf1bbe22eb4ac7b9 (diff)
downloadcoreutils-3309e880fb2b5d4316809c5ceef4f5b2b8d34a38.tar.xz
maint: consolidate developer debug messages
Both factor and numfmt recently introduced debug messages for developers, enabled by --verbose and ---devdebug respectively. There were a few issues though: 1. They used different mechanisms to enable these messages. 2. factor used --verbose which might be needed for something else 3. They used different methods to output the messages, and numfmt used error() which added an unwanted newline 4. numfmt marked all these messages for translation and factor marked a couple. We really don't need these translated. So we fix the above issues here while renaming the enabling option for both commands to ---debug (still undocumented). * src/factor.c (verbose): Rename to dev_debug and change from int to bool as it's just a toggle flag. (long_options): Rename --verbose to ---debug. * src/system.h (devmsg): A new inline function to output a message if enabled by a global dev_debug variable in the compilation unit. * src/numfmt.c: Use devmsg() rather than error(). Also remove the translation tags from these messages. Also change debug flag to bool from int. * tests/misc/numfmt.pl: Adjust for the ---devdebug to ---debug change. * cfg.mk (sc_marked_devdiagnostics): Add a syntax check to ensure translations are not added to devmsg calls. Reported by Göran Uddeborg in http://bugs.gnu.org/13665
Diffstat (limited to 'tests')
-rw-r--r--tests/misc/numfmt.pl22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/misc/numfmt.pl b/tests/misc/numfmt.pl
index b46e4d55b..61917fb8a 100644
--- a/tests/misc/numfmt.pl
+++ b/tests/misc/numfmt.pl
@@ -643,37 +643,37 @@ my @Tests =
# dev-debug messages - the actual messages don't matter
# just ensure the program works, and for code coverage testing.
- ['devdebug-1', '---devdebug --from=si 4.9K', {OUT=>"4900"},
+ ['devdebug-1', '---debug --from=si 4.9K', {OUT=>"4900"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-2', '---devdebug 4900', {OUT=>"4900"},
+ ['devdebug-2', '---debug 4900', {OUT=>"4900"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-3', '---devdebug --from=auto 4Mi', {OUT=>"4194304"},
+ ['devdebug-3', '---debug --from=auto 4Mi', {OUT=>"4194304"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-4', '---devdebug --to=si 4000000', {OUT=>"4.0M"},
+ ['devdebug-4', '---debug --to=si 4000000', {OUT=>"4.0M"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-5', '---devdebug --to=si --padding=5 4000000', {OUT=>" 4.0M"},
+ ['devdebug-5', '---debug --to=si --padding=5 4000000', {OUT=>" 4.0M"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-6', '---devdebug --suffix=Foo 1234Foo', {OUT=>"1234Foo"},
+ ['devdebug-6', '---debug --suffix=Foo 1234Foo', {OUT=>"1234Foo"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-7', '---devdebug --suffix=Foo 1234', {OUT=>"1234Foo"},
+ ['devdebug-7', '---debug --suffix=Foo 1234', {OUT=>"1234Foo"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-9', '---devdebug --grouping 10000', {OUT=>"10000"},
+ ['devdebug-9', '---debug --grouping 10000', {OUT=>"10000"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-10', '---devdebug --format %f 10000', {OUT=>"10000"},
+ ['devdebug-10', '---debug --format %f 10000', {OUT=>"10000"},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-11', '---devdebug --format "%\'-10f" 10000',{OUT=>"10000 "},
+ ['devdebug-11', '---debug --format "%\'-10f" 10000',{OUT=>"10000 "},
{ERR=>""},
{ERR_SUBST=>"s/.*//msg"}],
- ['devdebug-12', '---devdebug --field 2 A',{OUT=>""},
+ ['devdebug-12', '---debug --field 2 A',{OUT=>""},
{ERR=>""}, {EXIT=>2},
{ERR_SUBST=>"s/.*//msg"}],