Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit514c3f1

Browse files
committed
Pick up REGRESS_OPTS from contrib makefiles. Along the way, fix ordering of makefile tests to mimic gmake.
1 parent3bd2241 commit514c3f1

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

‎src/tools/msvc/vcregress.pl

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# -*-perl-*- hey - emacs - this is a perl file
33

4-
# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.10 2008/12/01 13:39:45 tgl Exp $
4+
# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.11 2009/08/18 22:36:56 adunstan Exp $
55

66
use strict;
77

@@ -180,15 +180,16 @@ sub contribcheck
180180
{
181181
nextunless-d"$module/sql" &&
182182
-d"$module/expected" &&
183-
(-f"$module/Makefile" ||-f"$module/GNUmakefile");
183+
(-f"$module/GNUmakefile" ||-f"$module/Makefile");
184184
chdir$module;
185185
print"============================================================\n";
186186
print"Checking$module\n";
187187
my@tests = fetchTests();
188+
my@opts = fetchRegressOpts();
188189
my@args = (
189190
"../../$Config/pg_regress/pg_regress",
190191
"--psqldir=../../$Config/psql",
191-
"--dbname=contrib_regression",@tests
192+
"--dbname=contrib_regression",@opts,@tests
192193
);
193194
system(@args);
194195
my$status =$? >> 8;
@@ -198,12 +199,31 @@ sub contribcheck
198199
exit$mstatif$mstat;
199200
}
200201

202+
subfetchRegressOpts
203+
{
204+
my$handle;
205+
open($handle,"<GNUmakefile")
206+
||open($handle,"<Makefile")
207+
||die"Could not open Makefile";
208+
local($/) =undef;
209+
my$m = <$handle>;
210+
close($handle);
211+
my@opts;
212+
if ($m =~/^\s*REGRESS_OPTS\s*=(.*)/m)
213+
{
214+
# ignore options that use makefile variables - can't handle those
215+
# ignore anything that isn't an option staring with --
216+
@opts =grep {$_ !~/\$\(/ &&$_ =~/^--/ }split(/\s+/,$1);
217+
}
218+
return@opts;
219+
}
220+
201221
subfetchTests
202222
{
203223

204224
my$handle;
205-
open($handle,"<Makefile")
206-
||open($handle,"<GNUmakefile")
225+
open($handle,"<GNUmakefile")
226+
||open($handle,"<Makefile")
207227
||die"Could not open Makefile";
208228
local($/) =undef;
209229
my$m = <$handle>;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp