GNU bug report logs -
#16061
Error in the message for src/shuf.c:73 in 8.22-pre3
Previous Next
Reported by: Philipp Thomas <pth <at> suse.de>
Date: Thu, 5 Dec 2013 20:55:02 UTC
Severity: normal
Done: Pádraig Brady <P <at> draigBrady.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 16061 in the body.
You can then email your comments to 16061 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Thu, 05 Dec 2013 20:55:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Philipp Thomas <pth <at> suse.de>:
New bug report received and forwarded. Copy sent to
bug-coreutils <at> gnu.org.
(Thu, 05 Dec 2013 20:55:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
The description for the -r option for shuf in 8.22-pre3 reads:
" -r, --repetitions output COUNT items, allowing repetition.\n"
" -n 1 is implied if not specified.\n"
Which is confusing as to what COUNT relates to.
Philipp
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Thu, 05 Dec 2013 23:39:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/05/2013 08:54 PM, Philipp Thomas wrote:
> The description for the -r option for shuf in 8.22-pre3 reads:
>
> " -r, --repetitions output COUNT items, allowing repetition.\n"
> " -n 1 is implied if not specified.\n"
>
> Which is confusing as to what COUNT relates to.
Yes this could be clearer. So the point is that --repetitions
only makes sense in the context of a specified --head-count.
How about:
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index c818a1e..5d49fef 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -4923,7 +4923,7 @@ operation modes:
@table @samp
-@item -n @var{lines}
+@item -n @var{count}
@itemx --head-count=@var{count}
@opindex -n
@opindex --head-count
diff --git a/src/shuf.c b/src/shuf.c
index f7fc936..4d0ae90 100644
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -76,8 +76,8 @@ Write a random permutation of the input lines to standard output.\n\
-n, --head-count=COUNT output at most COUNT lines\n\
-o, --output=FILE write result to FILE instead of standard output\n\
--random-source=FILE get random bytes from FILE\n\
- -r, --repetitions output COUNT items, allowing repetition.\n\
- -n 1 is implied if not specified.\n\
+ -r, --repetitions allow repetition within a specified --head-count\n\
+ which is assumed to be 1, if not specified.\n\
-z, --zero-terminated end lines with 0 byte, not newline\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 00:16:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 12:37 AM, Pádraig Brady wrote:
> diff --git a/src/shuf.c b/src/shuf.c
> index f7fc936..4d0ae90 100644
> --- a/src/shuf.c
> +++ b/src/shuf.c
> @@ -76,8 +76,8 @@ Write a random permutation of the input lines to standard output.\n\
> -n, --head-count=COUNT output at most COUNT lines\n\
> -o, --output=FILE write result to FILE instead of standard output\n\
> --random-source=FILE get random bytes from FILE\n\
> - -r, --repetitions output COUNT items, allowing repetition.\n\
> - -n 1 is implied if not specified.\n\
> + -r, --repetitions allow repetition within a specified --head-count\n\
> + which is assumed to be 1, if not specified.\n\
n=1 is not really a repetition. ;-)
BTW: What was the reason to default n=1 with -r anyway?
I mean as the user did not specify any limit he may assume
the same number as in the input, like without -r.
Besides that, I can't think of a better wording than above.
Have a nice day,
Berny
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 01:14:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 12:15 AM, Bernhard Voelker wrote:
> On 12/06/2013 12:37 AM, Pádraig Brady wrote:
>> diff --git a/src/shuf.c b/src/shuf.c
>> index f7fc936..4d0ae90 100644
>> --- a/src/shuf.c
>> +++ b/src/shuf.c
>> @@ -76,8 +76,8 @@ Write a random permutation of the input lines to standard output.\n\
>> -n, --head-count=COUNT output at most COUNT lines\n\
>> -o, --output=FILE write result to FILE instead of standard output\n\
>> --random-source=FILE get random bytes from FILE\n\
>> - -r, --repetitions output COUNT items, allowing repetition.\n\
>> - -n 1 is implied if not specified.\n\
>> + -r, --repetitions allow repetition within a specified --head-count\n\
>> + which is assumed to be 1, if not specified.\n\
>
> n=1 is not really a repetition. ;-)
>
> BTW: What was the reason to default n=1 with -r anyway?
> I mean as the user did not specify any limit he may assume
> the same number as in the input, like without -r.
Well --repetitions means --allow-repetitions and in this mode
we're just picking random items from the input.
So it doesn't make much sense then to output the same number
of items as was input in this mode. It makes more sense to
default to picking a single random item. Now granted that is
a bit of an awkward default in the context of the --repetitions name.
Though you could read `gen_data | shuf -r` as pick a
random item from the data, which is less awkward.
I suppose we could make -r require that -n is specified,
but I'm not sure.
Other edge cases I've now noticed...
-n1 could degenerate to the faster --repetitions mode in all cases
-n0 -r should exit without reading input
These edge case fixes are not worth adding to this release though.
thanks,
Pádraig.
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 01:27:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 02:13 AM, Pádraig Brady wrote:
> On 12/06/2013 12:15 AM, Bernhard Voelker wrote:
>> On 12/06/2013 12:37 AM, Pádraig Brady wrote:
>>> diff --git a/src/shuf.c b/src/shuf.c
>>> index f7fc936..4d0ae90 100644
>>> --- a/src/shuf.c
>>> +++ b/src/shuf.c
>>> @@ -76,8 +76,8 @@ Write a random permutation of the input lines to standard output.\n\
>>> -n, --head-count=COUNT output at most COUNT lines\n\
>>> -o, --output=FILE write result to FILE instead of standard output\n\
>>> --random-source=FILE get random bytes from FILE\n\
>>> - -r, --repetitions output COUNT items, allowing repetition.\n\
>>> - -n 1 is implied if not specified.\n\
>>> + -r, --repetitions allow repetition within a specified --head-count\n\
>>> + which is assumed to be 1, if not specified.\n\
>>
>> n=1 is not really a repetition. ;-)
>>
>> BTW: What was the reason to default n=1 with -r anyway?
>> I mean as the user did not specify any limit he may assume
>> the same number as in the input, like without -r.
>
> Well --repetitions means --allow-repetitions and in this mode
> we're just picking random items from the input.
> So it doesn't make much sense then to output the same number
> of items as was input in this mode. It makes more sense to
> default to picking a single random item. Now granted that is
> a bit of an awkward default in the context of the --repetitions name.
> Though you could read `gen_data | shuf -r` as pick a
> random item from the data, which is less awkward.
Thanks, with this explanation, this default makes sense, agreed.
> I suppose we could make -r require that -n is specified,
> but I'm not sure.
Regarding this in the above context - no, because then you would
have to specify -n1 when "picking 1 random item". Saving the user
from typing -n1 seems to be _the_ reason for assuming n=1.
> Other edge cases I've now noticed...
>
> -n1 could degenerate to the faster --repetitions mode in all cases
> -n0 -r should exit without reading input
>
> These edge case fixes are not worth adding to this release though.
Agreed.
Thanks & have a nice day,
Berny
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 01:37:01 GMT)
Full text and
rfc822 format available.
Message #20 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 02:26 AM, Bernhard Voelker wrote:
> On 12/06/2013 02:13 AM, Pádraig Brady wrote:
>> I suppose we could make -r require that -n is specified,
>> but I'm not sure.
>
> Regarding this in the above context - no, because then you would
> have to specify -n1 when "picking 1 random item". Saving the user
> from typing -n1 seems to be _the_ reason for assuming n=1.
OTOH there may be cases where you don't know the number of items
beforehand, but you want shuf to output that number of random items
from the input regardless of repetitions:
$ gen_data | shuf -r
Shuf will know the number of elements and may easily pick that
number incl. repetitions.
If you want to pick just one, you know it and it's easy to say -n1,
but it's not that easy in the above case.
Have a nice day,
Berny
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 01:46:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 01:36 AM, Bernhard Voelker wrote:
> On 12/06/2013 02:26 AM, Bernhard Voelker wrote:
>> On 12/06/2013 02:13 AM, Pádraig Brady wrote:
>>> I suppose we could make -r require that -n is specified,
>>> but I'm not sure.
>>
>> Regarding this in the above context - no, because then you would
>> have to specify -n1 when "picking 1 random item". Saving the user
>> from typing -n1 seems to be _the_ reason for assuming n=1.
>
> OTOH there may be cases where you don't know the number of items
> beforehand, but you want shuf to output that number of random items
> from the input regardless of repetitions:
>
> $ gen_data | shuf -r
>
> Shuf will know the number of elements and may easily pick that
> number incl. repetitions.
>
> If you want to pick just one, you know it and it's easy to say -n1,
> but it's not that easy in the above case.
But with random selection would there ever be a link
between input and output cardinality?
I can't think of a case that there would be.
Pádraig.
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 06:52:01 GMT)
Full text and
rfc822 format available.
Message #26 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 02:45 AM, Pádraig Brady wrote:
> But with random selection would there ever be a link
> between input and output cardinality?
> I can't think of a case that there would be.
+1
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 17:58:02 GMT)
Full text and
rfc822 format available.
Message #29 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/05/2013 04:15 PM, Bernhard Voelker wrote:
> BTW: What was the reason to default n=1 with -r anyway?
There is no reason, and I see that I should have reviewed the --repetition
patch better. Let's change the default back to infinity, which
is what it was before. And let's change --repetitions to --repeat.
Here's a patch, which I've taken the liberty of pushing.
From dc96593f18ae3a3264aad437add74f081e770cfc Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert <at> cs.ucla.edu>
Date: Fri, 6 Dec 2013 09:55:17 -0800
Subject: [PATCH] shuf: --repeat, not --repetitions; default --head-count is
infinity
Original problem reported by Philipp Thomas in
<http://bugs.gnu.org/16061>.
* NEWS: shuf --repeat, not shuf --repetitions.
* doc/coreutils.texi (shuf invocation):
* src/shuf.c (usage, long_opts, main):
* tests/misc/shuf.sh:
Likewise. Also, the default head-count is infinity.
---
NEWS | 4 ++--
doc/coreutils.texi | 37 +++++++++++-------------------
src/shuf.c | 67 ++++++++++++++++++++++++------------------------------
tests/misc/shuf.sh | 50 ++++++++++++++++++++--------------------
4 files changed, 70 insertions(+), 88 deletions(-)
diff --git a/NEWS b/NEWS
index 529c54b..87fd27d 100644
--- a/NEWS
+++ b/NEWS
@@ -92,8 +92,8 @@ GNU coreutils NEWS -*- outline -*-
shred accepts new parameters to the --remove option to give greater
control over that operation, which can greatly reduce sync overhead.
- shuf accepts a new option: --repetitions (-r), to allow repetitions
- of input items in the permuted output.
+ shuf accepts a new option: --repeat (-r), which can repeat items in
+ the output.
** Changes in behavior
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 74d5025..ed311a1 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -4948,14 +4948,16 @@ Use @var{file} as a source of random data used to determine which
permutation to generate. @xref{Random sources}.
@item -r
-@itemx --repetitions
+@itemx --repeat
@opindex -r
-@opindex --repetitions
-@cindex allowing repetitions in output values
-Changes the default behaviour of @command{shuf}, allowing repetition in
-output values (in which case, @option{--head-count} can be larger
-than the number of input values). If @option{--head-count} is not
-specified, output a single random value.
+@opindex --repeat
+@cindex repeat output values
+Repeat output values, that is, select with replacement. With this
+option the output is not a permutation of the input; instead, each
+output line is randomly chosen from all the inputs. This option is
+typically combined with @option{--head-count}; if
+@option{--head-count} is not given, @command{shuf} repeats
+indefinitely.
@zeroTerminatedOption
@@ -5010,37 +5012,24 @@ and the command @samp{shuf -i 1-4} might output:
@end example
@noindent
-These examples all have four input lines, so @command{shuf} might
+The above examples all have four input lines, so @command{shuf} might
produce any of the twenty-four possible permutations of the input. In
general, if there are @var{n} input lines, there are @var{n}! (i.e.,
@var{n} factorial, or @var{n} * (@var{n} - 1) * @dots{} * 1) possible
output permutations.
@noindent
-To output 50 random numbers between 0 and 9, use:
+To output 50 random numbers each in the range 0 through 9, use:
@example
-shuf --repetitions --input-range 0-9 --head-count 50
-@end example
-
-@noindent
-or (using short options):
-
-@example
-shuf -r -i0-9 -n50
+shuf -r -n 50 -i 0-9
@end example
@noindent
To simulate 100 coin flips, use:
@example
-shuf -r -n100 -e Head Tail
-@end example
-
-@noindent
-or
-@example
-printf '%s\n' Head Tail | shuf -r -n100
+shuf -r -n 100 -e Head Tail
@end example
@exitstatus
diff --git a/src/shuf.c b/src/shuf.c
index f7fc936..456140f 100644
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -76,8 +76,7 @@ Write a random permutation of the input lines to standard output.\n\
-n, --head-count=COUNT output at most COUNT lines\n\
-o, --output=FILE write result to FILE instead of standard output\n\
--random-source=FILE get random bytes from FILE\n\
- -r, --repetitions output COUNT items, allowing repetition.\n\
- -n 1 is implied if not specified.\n\
+ -r, --repeat output lines can be repeated\n\
-z, --zero-terminated end lines with 0 byte, not newline\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
@@ -106,7 +105,7 @@ static struct option const long_opts[] =
{"head-count", required_argument, NULL, 'n'},
{"output", required_argument, NULL, 'o'},
{"random-source", required_argument, NULL, RANDOM_SOURCE_OPTION},
- {"repetitions", no_argument, NULL, 'r'},
+ {"repeat", no_argument, NULL, 'r'},
{"zero-terminated", no_argument, NULL, 'z'},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
@@ -300,10 +299,10 @@ read_input (FILE *in, char eolbyte, char ***pline)
return n_lines;
}
-/* output 'n_lines' to stdout from 'line' array,
- chosen by the indices in 'permutation'.
- 'permutation' and 'line' must have at least 'n_lines' elements.
- strings in 'line' must include the line-terminator character. */
+/* Output N_LINES lines to stdout from LINE array,
+ chosen by the indices in PERMUTATION.
+ PERMUTATION and LINE must have at least N_LINES elements.
+ Strings in LINE must include the line-terminator character. */
static int
write_permuted_lines (size_t n_lines, char *const *line,
size_t const *permutation)
@@ -321,8 +320,8 @@ write_permuted_lines (size_t n_lines, char *const *line,
return 0;
}
-/* output 'n_lines' of numbers to stdout, from 'permutation' array.
- 'permutation' must have at least 'n_lines' elements. */
+/* Output N_LINES of numbers to stdout, from PERMUTATION array.
+ PERMUTATION must have at least N_LINES elements. */
static int
write_permuted_numbers (size_t n_lines, size_t lo_input,
size_t const *permutation, char eolbyte)
@@ -339,8 +338,8 @@ write_permuted_numbers (size_t n_lines, size_t lo_input,
return 0;
}
-/* output 'count' numbers to stdout, chosen randomly from range
- lo_input to hi_input. */
+/* Output COUNT numbers to stdout, chosen randomly from range
+ LO_INPUT through HI_INPUT. */
static int
write_random_numbers (struct randint_source *s, size_t count,
size_t lo_input, size_t hi_input, char eolbyte)
@@ -358,9 +357,9 @@ write_random_numbers (struct randint_source *s, size_t count,
return 0;
}
-/* output 'count' lines to stdout from 'lines' array.
- 'lines' must have at least 'n_lines' element in it.
- strings in 'line' must include the line-terminator character. */
+/* Output COUNT lines to stdout from LINES array.
+ LINES must have at least N_LINES elements in it.
+ Strings in LINES_ must include the line-terminator character. */
static int
write_random_lines (struct randint_source *s, size_t count,
char *const *lines, size_t n_lines)
@@ -392,7 +391,7 @@ main (int argc, char **argv)
char eolbyte = '\n';
char **input_lines = NULL;
bool use_reservoir_sampling = false;
- bool repetition = false;
+ bool repeat = false;
int optc;
int n_operands;
@@ -479,7 +478,7 @@ main (int argc, char **argv)
break;
case 'r':
- repetition = true;
+ repeat = true;
break;
case 'z':
@@ -495,20 +494,19 @@ main (int argc, char **argv)
n_operands = argc - optind;
operand = argv + optind;
- /* Check invalid usage */
+ /* Check invalid usage. */
if (echo && input_range)
{
error (0, 0, _("cannot combine -e and -i options"));
usage (EXIT_FAILURE);
}
- if ((n_operands>0 && input_range)
- || (!echo && !input_range && n_operands>=2))
+ if (input_range ? 0 < n_operands : !echo && 1 < n_operands)
{
error (0, 0, _("extra operand %s"), quote (operand[1]));
usage (EXIT_FAILURE);
}
- /* Prepare input */
+ /* Prepare input. */
if (echo)
{
input_from_argv (operand, n_operands, eolbyte);
@@ -522,15 +520,15 @@ main (int argc, char **argv)
}
else
{
- /* Input file specified, re-open it as STDIN */
- if (n_operands==1)
- if (! (STREQ (operand[0], "-") || ! head_lines
- || freopen (operand[0], "r", stdin)))
- error (EXIT_FAILURE, errno, "%s", operand[0]);
+ /* If an input file is specified, re-open it as stdin. */
+ if (n_operands == 1)
+ if (! (STREQ (operand[0], "-") || ! head_lines
+ || freopen (operand[0], "r", stdin)))
+ error (EXIT_FAILURE, errno, "%s", operand[0]);
fadvise (stdin, FADVISE_SEQUENTIAL);
- if (! repetition && head_lines != SIZE_MAX
+ if (! repeat && head_lines != SIZE_MAX
&& (! head_lines || input_size () > RESERVOIR_MIN_INPUT))
{
use_reservoir_sampling = true;
@@ -543,18 +541,13 @@ main (int argc, char **argv)
}
}
- /* When generating random numbers with repetitions,
- the default count is one, unless specified by the user. */
- if (repetition && head_lines == SIZE_MAX)
- head_lines = 1 ;
-
- if (! repetition)
+ if (! repeat)
head_lines = MIN (head_lines, n_lines);
randint_source = randint_all_new (random_source,
- (use_reservoir_sampling || repetition)?
- SIZE_MAX:
- randperm_bound (head_lines, n_lines));
+ (use_reservoir_sampling || repeat
+ ? SIZE_MAX
+ : randperm_bound (head_lines, n_lines)));
if (! randint_source)
error (EXIT_FAILURE, errno, "%s", quotearg_colon (random_source));
@@ -574,14 +567,14 @@ main (int argc, char **argv)
&& (fclose (stdin) != 0))
error (EXIT_FAILURE, errno, _("read error"));
- if (!repetition)
+ if (!repeat)
permutation = randperm_new (randint_source, head_lines, n_lines);
if (outfile && ! freopen (outfile, "w", stdout))
error (EXIT_FAILURE, errno, "%s", quotearg_colon (outfile));
/* Generate output according to requested method */
- if (repetition)
+ if (repeat)
{
if (input_range)
i = write_random_numbers (randint_source, head_lines,
diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh
index a25a6f8..28c6483 100755
--- a/tests/misc/shuf.sh
+++ b/tests/misc/shuf.sh
@@ -94,66 +94,66 @@ shuf -i0-9 -o A -o B &&
shuf -i0-9 --random-source A --random-source B &&
{ fail=1; echo "shuf did not detect multiple --random-source usage.">&2 ; }
-# Test --repetition option
+# Test --repeat option
-# --repetition without count should return one line
-shuf --rep -i0-10 > exp || framework_failure_
+# --repeat without count should return an indefinite number of lines
+shuf --rep -i 0-10 | head -n 1000 > exp || framework_failure_
c=$(wc -l < exp) || framework_failure_
-test "$c" -eq 1 || { fail=1; echo "--repetition default count is not 1">&2 ; }
+test "$c" -eq 1000 || { fail=1; echo "--repeat does not repeat indefinitely">&2 ; }
-# --repetition can output more values than the input range
+# --repeat can output more values than the input range
shuf --rep -i0-9 -n1000 > exp || framework_failure_
c=$(wc -l < exp) || framework_failure_
-test "$c" -eq 1000 || { fail=1; echo "--repetition with --count failed">&2 ; }
+test "$c" -eq 1000 || { fail=1; echo "--repeat with --count failed">&2 ; }
# Check output values (this is not bullet-proof, but drawing 1000 values
# between 0 and 9 should produce all values, unless there's a bug in shuf
# or a very poor random source, or extremely bad luck)
c=$(sort -nu exp | paste -s -d ' ') || framework_failure_
test "$c" = "0 1 2 3 4 5 6 7 8 9" ||
- { fail=1; echo "--repetition produced bad output">&2 ; }
+ { fail=1; echo "--repeat produced bad output">&2 ; }
-# check --repetition with non-zero low value
+# check --repeat with non-zero low value
shuf --rep -i222-233 -n2000 > exp || framework_failure_
c=$(cat exp | sort -nu | paste -s -d ' ') || framework_failure_
test "$c" = "222 223 224 225 226 227 228 229 230 231 232 233" ||
- { fail=1; echo "--repetition produced bad output with non-zero low">&2 ; }
+ { fail=1; echo "--repeat produced bad output with non-zero low">&2 ; }
-# --repetition,-i,count=0 should not fail and produce no output
+# --repeat,-i,count=0 should not fail and produce no output
shuf --rep -i0-9 -n0 > exp || framework_failure_
# file size should be zero (no output from shuf)
test \! -s exp ||
- { fail=1; echo "--repetition,-i0-9,-n0 produced bad output">&2 ; }
+ { fail=1; echo "--repeat,-i0-9,-n0 produced bad output">&2 ; }
-# --repetition with -e, without count, should return one line
-shuf --rep -e A B C D > exp || framework_failure_
-c=$(cat exp | wc -l) || framework_failure_
-test "$c" -eq 1 ||
- { fail=1; echo "--repetition,-e default count is not 1">&2 ; }
+# --repeat with -e, without count, should repeat indefinitely
+shuf --rep -e A B C D | head -n 1000 > exp || framework_failure_
+c=$(wc -l < exp) || framework_failure_
+test "$c" -eq 1000 ||
+ { fail=1; echo "--repeat,-e does not repeat indefinitely">&2 ; }
-# --repetition with STDIN, without count, should return one line
-printf "A\nB\nC\nD\nE\n" | shuf --rep > exp || framework_failure_
+# --repeat with STDIN, without count, should repeat indefinitely
+printf "A\nB\nC\nD\nE\n" | shuf --rep | head -n 1000 > exp || framework_failure_
c=$(wc -l < exp) || framework_failure_
-test "$c" -eq 1 ||
- { fail=1; echo "--repetition,STDIN default count is not 1">&2 ; }
+test "$c" -eq 1000 ||
+ { fail=1; echo "--repeat,STDIN does not repeat indefinitely">&2 ; }
-# --repetition with STDIN,count - can return move values than input lines
+# --repeat with STDIN,count - can return move values than input lines
printf "A\nB\nC\nD\nE\n" | shuf --rep -n2000 > exp || framework_failure_
c=$(wc -l < exp) || framework_failure_
test "$c" -eq 2000 ||
- { fail=1; echo "--repetition,STDIN,count failed">&2 ; }
+ { fail=1; echo "--repeat,STDIN,count failed">&2 ; }
# Check output values (this is not bullet-proof, but drawing 2000 values
# between A and E should produce all values, unless there's a bug in shuf
# or a very poor random source, or extremely bad luck)
c=$(sort -u exp | paste -s -d ' ') || framework_failure_
test "$c" = "A B C D E" ||
- { fail=1; echo "--repetition,STDIN,count produced bad output">&2 ; }
+ { fail=1; echo "--repeat,STDIN,count produced bad output">&2 ; }
-# --repetition,stdin,count=0 should not fail and produce no output
+# --repeat,stdin,count=0 should not fail and produce no output
printf "A\nB\nC\nD\nE\n" | shuf --rep -n0 > exp || framework_failure_
# file size should be zero (no output from shuf)
test \! -s exp ||
- { fail=1; echo "--repetition,STDIN,-n0 produced bad output">&2 ; }
+ { fail=1; echo "--repeat,STDIN,-n0 produced bad output">&2 ; }
Exit $fail
--
1.8.3.1
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 18:52:01 GMT)
Full text and
rfc822 format available.
Message #32 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 05:57 PM, Paul Eggert wrote:
> On 12/05/2013 04:15 PM, Bernhard Voelker wrote:
>> BTW: What was the reason to default n=1 with -r anyway?
>
> There is no reason, and I see that I should have reviewed the --repetition
> patch better. Let's change the default back to infinity, which
> is what it was before. And let's change --repetitions to --repeat.
> Here's a patch, which I've taken the liberty of pushing.
Not great timing, but I do agree with the change.
It all looks good.
thanks,
Pádraig.
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 19:27:01 GMT)
Full text and
rfc822 format available.
Message #35 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 06:57 PM, Paul Eggert wrote:
> Here's a patch, which I've taken the liberty of pushing.
Thanks, I'm fine with this behavior.
Minor nit: sc_long_lines is triggered.
BTW: I noticed another tiny flaw in the test (not related to
your patch). The following fixes both.
Have a nice day,
Berny
From b4f5dca24f3ca2eea6060cff9695d746c125747b Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail <at> bernhard-voelker.de>
Date: Fri, 6 Dec 2013 20:24:38 +0100
Subject: [PATCH] tests: fix shuf test verifying that -i and -e can not be
combined
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Previously, the test triggered another error diagnostic:
shuf: invalid input range ‘-e’
and therefore eclipsed the expected one:
shuf: cannot combine -e and -i options
While at it, reindent a line with more than 80 characters, present
since the previous commit to silence sc_long_lines.
* tests/misc/shuf.sh: Pass a valid range to the -i option.
---
tests/misc/shuf.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh
index 28c6483..b2cd1ab 100755
--- a/tests/misc/shuf.sh
+++ b/tests/misc/shuf.sh
@@ -73,7 +73,7 @@ test "$c" -eq 3 || { fail=1; echo "Multiple -n failed">&2 ; }
# Test error conditions
# -i and -e must not be used together
-: | shuf -i -e A B &&
+: | shuf -i0-9 -e A B &&
{ fail=1; echo "shuf did not detect erroneous -e and -i usage.">&2 ; }
# Test invalid value for -n
: | shuf -nA &&
@@ -99,7 +99,8 @@ shuf -i0-9 --random-source A --random-source B &&
# --repeat without count should return an indefinite number of lines
shuf --rep -i 0-10 | head -n 1000 > exp || framework_failure_
c=$(wc -l < exp) || framework_failure_
-test "$c" -eq 1000 || { fail=1; echo "--repeat does not repeat indefinitely">&2 ; }
+test "$c" -eq 1000 \
+ || { fail=1; echo "--repeat does not repeat indefinitely">&2 ; }
# --repeat can output more values than the input range
shuf --rep -i0-9 -n1000 > exp || framework_failure_
--
1.8.3.1
Reply sent
to
Pádraig Brady <P <at> draigBrady.com>:
You have taken responsibility.
(Fri, 06 Dec 2013 20:11:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Philipp Thomas <pth <at> suse.de>:
bug acknowledged by developer.
(Fri, 06 Dec 2013 20:11:03 GMT)
Full text and
rfc822 format available.
Message #40 received at 16061-done <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 07:26 PM, Bernhard Voelker wrote:
> On 12/06/2013 06:57 PM, Paul Eggert wrote:
>> Here's a patch, which I've taken the liberty of pushing.
>
> Thanks, I'm fine with this behavior.
> Minor nit: sc_long_lines is triggered.
>
> BTW: I noticed another tiny flaw in the test (not related to
> your patch). The following fixes both.
good spot!
Please push.
Marking this bug as done.
thanks everyone,
Pádraig.
Information forwarded
to
bug-coreutils <at> gnu.org:
bug#16061; Package
coreutils.
(Fri, 06 Dec 2013 20:52:02 GMT)
Full text and
rfc822 format available.
Message #43 received at 16061 <at> debbugs.gnu.org (full text, mbox):
On 12/06/2013 09:09 PM, Pádraig Brady wrote:
> On 12/06/2013 07:26 PM, Bernhard Voelker wrote:
>> BTW: I noticed another tiny flaw in the test (not related to
>> your patch). The following fixes both.
>
> good spot!
>
> Please push.
Thanks, done: v8.21-179-gb4f5dca
Have a nice day,
Berny
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Sat, 04 Jan 2014 12:24:04 GMT)
Full text and
rfc822 format available.
This bug report was last modified 10 years and 113 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.