diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-06 23:24:51 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-06 23:24:51 +0000 |
| commit | 108cf1776caa5e59c4cb1ab3dedcdcf5c5ba5ef5 (patch) | |
| tree | fb41ac292252903edcd6ef7a56a825224d78fa07 /contrib | |
| parent | 499c8b1ed3d898eff2c9b74468aad9b8fdee184f (diff) | |
| download | gcc-108cf1776caa5e59c4cb1ab3dedcdcf5c5ba5ef5.tar.gz | |
Port to hosts whose 'sort' and 'tail' implementations
treat operands with leading '+' as file names, as POSIX
has required since 2001. However, make sure the code still
works on pre-POSIX hosts.
* ltmain.sh: Don't assume "sort +2" is equivalent to
"sort -k 3", since POSIX 1003.1-2001 no longer requires this.
contrib:
* compare_tests: Don't assume "sort +2" is equivalent to
"sort -k 3", since POSIX 1003.1-2001 no longer requires this.
gcc:
* Makefile.in (slowcompare): Port to POSIX 1003.1-2001,
which says you should use "tail -c +N" rather than "tail +Nc".
Fix a bug: the old code incorrectly skipped 15 bytes, not 16.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115234 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 9 | ||||
| -rwxr-xr-x | contrib/compare_tests | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 120213ac20f..35d29b96f12 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,12 @@ +2006-07-06 Paul Eggert <eggert@cs.ucla.edu> + + Port to hosts whose 'sort' and 'tail' implementations + treat operands with leading '+' as file names, as POSIX + has required since 2001. However, make sure the code still + works on pre-POSIX hosts. + * compare_tests: Don't assume "sort +2" is equivalent to + "sort -k 3", since POSIX 1003.1-2001 no longer requires this. + 2006-06-05 James Lemke <jwlemke@wasabisystems.com> * dg-cmp-results.sh: New script for comparing DejaGNU logs. diff --git a/contrib/compare_tests b/contrib/compare_tests index bcf678c52ea..bed97429d66 100755 --- a/contrib/compare_tests +++ b/contrib/compare_tests @@ -31,8 +31,14 @@ now=$tmp2 exit_status=0 trap "rm -f $tmp1 $tmp2 $now_s $before_s" 0 1 2 3 5 9 13 15 -sort -t ':' +1 "$now" > "$now_s" -sort -t ':' +1 "$before" > "$before_s" +if sort -k 2 </dev/null >/dev/null 2>&1; then + skip1='-k 2' +else + skip1='+1' +fi + +sort -t ':' $skip1 "$now" > "$now_s" +sort -t ':' $skip1 "$before" > "$before_s" grep '^FAIL:' "$now_s" | sed 's/^[^:]*:[ ]//' >$tmp1 grep '^PASS' "$before_s" | sed 's/^[^:]*:[ ]//' | comm -12 $tmp1 - >$tmp2 |