This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: contrib/compare_tests
- From: Loren James Rittle <rittle at latour dot rsch dot comm dot mot dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 4 Apr 2003 04:06:22 -0600 (CST)
- Subject: PATCH: contrib/compare_tests
- Reply-to: rittle at labs dot mot dot com
Attn: Mike Stump. For as long as I can remember, dejagnu in my
environments has used spaces instead of tabs after ``<DISPOSITION>:''
in the .sum (and .log) files. Why there is a difference is not known
to me but this patch to handle either type of input file is obvious.
However, Mike Stump, as the original source of the script, I think you
have rights of first refusal. Ok to install on mainline?
Currently running (as installed from FreeBSD ports but issue also seen
with random FSF releases)
Expect version is 5.38.0 /5.26
Tcl version is 8.3 /8.0
Framework version is 1.4.3 /1.4.0
* compare_tests: Allow space or tab after disposition.
Index: contrib/compare_tests
===================================================================
RCS file: /cvs/gcc/gcc/contrib/compare_tests,v
retrieving revision 1.2
diff -c -r1.2 compare_tests
*** contrib/compare_tests 4 Sep 1999 15:08:53 -0000 1.2
--- contrib/compare_tests 4 Apr 2003 09:53:19 -0000
***************
*** 31,38 ****
sort +0.4 "$now" > "$now_s"
sort +0.4 "$before" > "$before_s"
! grep '^FAIL' "$now_s" | sed 's/^....: //' >$tmp1
! grep '^PASS' "$before_s" | sed 's/^....: //' | comm -12 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
--- 31,38 ----
sort +0.4 "$now" > "$now_s"
sort +0.4 "$before" > "$before_s"
! grep '^FAIL' "$now_s" | sed 's/^....:[ ]//' >$tmp1
! grep '^PASS' "$before_s" | sed 's/^....:[ ]//' | comm -12 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
***************
*** 42,49 ****
echo
fi
! grep '^PASS' "$now_s" | sed 's/^....: //' >$tmp1
! grep '^FAIL' "$before_s" | sed 's/^....: //' | comm -12 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
--- 42,49 ----
echo
fi
! grep '^PASS' "$now_s" | sed 's/^....:[ ]//' >$tmp1
! grep '^FAIL' "$before_s" | sed 's/^....:[ ]//' | comm -12 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
***************
*** 53,60 ****
echo
fi
! grep '^FAIL' "$now_s" | sed 's/^....: //' >$tmp1
! grep '^[PF]A[SI][SL]' "$before_s" | sed 's/^....: //' | comm -23 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
--- 53,60 ----
echo
fi
! grep '^FAIL' "$now_s" | sed 's/^....:[ ]//' >$tmp1
! grep '^[PF]A[SI][SL]' "$before_s" | sed 's/^....:[ ]//' | comm -23 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
***************
*** 64,71 ****
echo
fi
! grep '^PASS' "$now_s" | sed 's/^....: //' >$tmp1
! grep '^[PF]A[SI][SL]' "$before_s" | sed 's/^....: //' | comm -23 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
--- 64,71 ----
echo
fi
! grep '^PASS' "$now_s" | sed 's/^....:[ ]//' >$tmp1
! grep '^[PF]A[SI][SL]' "$before_s" | sed 's/^....:[ ]//' | comm -23 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
***************
*** 75,82 ****
echo
fi
! grep '^[PF]A[SI][SL]' "$now_s" | sed 's/^....: //' >$tmp1
! grep '^PASS' "$before_s" | sed 's/^....: //' | comm -13 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
--- 75,82 ----
echo
fi
! grep '^[PF]A[SI][SL]' "$now_s" | sed 's/^....:[ ]//' >$tmp1
! grep '^PASS' "$before_s" | sed 's/^....:[ ]//' | comm -13 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
***************
*** 86,93 ****
echo
fi
! grep '^[PF]A[SI][SL]' "$now_s" | sed 's/^....: //' >$tmp1
! grep '^FAIL' "$before_s" | sed 's/^....: //' | comm -13 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then
--- 86,93 ----
echo
fi
! grep '^[PF]A[SI][SL]' "$now_s" | sed 's/^....:[ ]//' >$tmp1
! grep '^FAIL' "$before_s" | sed 's/^....:[ ]//' | comm -13 $tmp1 - >$tmp2
grep -s . $tmp2 >/dev/null
if [ $? = 0 ]; then