On Mon, Aug 28, 2006 at 12:16:40PM -0400, Tom Lane wrote:
> 122c122
> < #line 36 "show.pgc"
> AFAICS there is no very good way to deal with this. I'd suggest
> providing a way to suppress #line output from the ecpg preprocessor,
> but perhaps there is another answer.
What about changing those lines before diffing the files? This is already
done for different default port settings in order to keep output files in
sync.
I append a small (untested) patch against pg_regress.sh.
Unfortunately, lines like this one in a non-VPATH build:
#line 1 "./../../include/sql3types.h"
would get stripped to `#line 1 "sql3types.h"' as well but I think this is
acceptable.
Joachim
--
Joachim Wieland [EMAIL PROTECTED]
GPG key available
Index: pg_regress.sh
===================================================================
RCS file: /projects/cvsroot/pgsql/src/interfaces/ecpg/test/pg_regress.sh,v
retrieving revision 1.7
diff -c -r1.7 pg_regress.sh
*** pg_regress.sh 28 Aug 2006 16:13:11 -0000 1.7
--- pg_regress.sh 28 Aug 2006 20:40:56 -0000
***************
*** 745,750 ****
--- 745,754 ----
done
fi
+ mv "$outfile_source" "$outfile_source.tmp"
+ cat "$outfile_source.tmp" | sed -e 's,^\(#line [0-9]*\)
".*/\([^/]*\)",\1 "\2",' > "$outfile_source"
+ rm "$outfile_source.tmp"
+
DIFFER=""
diff $DIFFFLAGS expected/$outprg.stderr "$outfile_stderr" > /dev/null
2>&1
if [ $? != 0 ]; then
---------------------------(end of broadcast)---------------------------
TIP 1: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
