From fd1cfdb5574c49b15e97018b206ce3e63fc7c4ec Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 10 Oct 2013 15:20:21 +0000 Subject: [PATCH] Take stderr noise from diff as failure. Fixes false negatives (#2505) git-svn-id: http://svn.osgeo.org/postgis/trunk@12028 b70326c6-7e19-0410-871a-916f4a2858ee --- regress/run_test.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/run_test.pl b/regress/run_test.pl index 236520458..bf59ef4ce 100755 --- a/regress/run_test.pl +++ b/regress/run_test.pl @@ -1282,12 +1282,12 @@ sub diff my $diffstr = ''; if ( $sysdiff ) { - $diffstr = `diff --strip-trailing-cr -u $expected_file $obtained_file`; + $diffstr = `diff --strip-trailing-cr -u $expected_file $obtained_file 2>&1`; return $diffstr; } - open(OBT, $obtained_file) || die "Cannot open $obtained_file\n"; - open(EXP, $expected_file) || die "Cannot open $expected_file\n"; + open(OBT, $obtained_file) || return "Cannot open $obtained_file\n"; + open(EXP, $expected_file) || return "Cannot open $expected_file\n"; my $lineno = 0; while (!eof(OBT) or !eof(EXP)) { # TODO: check for premature end of one or the other ? -- 2.50.0