pgsql: Respect TEMP_CONFIG when running contrib regression tests.

Started by Robert Haasabout 10 years ago13 messageshackers
Jump to latest
#1Robert Haas
robertmhaas@gmail.com

Respect TEMP_CONFIG when running contrib regression tests.

Thomas Munro

Branch
------
master

Details
-------
http://git.postgresql.org/pg/commitdiff/9117985b6ba9beda4f280f596035649fc23b6233

Modified Files
--------------
contrib/contrib-global.mk | 5 +++++
1 file changed, 5 insertions(+)

--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

#2Andrew Dunstan
andrew@dunslane.net
In reply to: Robert Haas (#1)
Re: pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On 02/26/2016 02:10 AM, Robert Haas wrote:

Respect TEMP_CONFIG when running contrib regression tests.

Wouldn't it be better to move this stuff from here and the regress
Makefile into Makefile.global.in?

That's what I was planning to do when I had time.

cheers

andrew

--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

#3Robert Haas
robertmhaas@gmail.com
In reply to: Andrew Dunstan (#2)
Re: pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On Sat, Feb 27, 2016 at 6:19 AM, Andrew Dunstan <andrew@dunslane.net> wrote:

On 02/26/2016 02:10 AM, Robert Haas wrote:

Respect TEMP_CONFIG when running contrib regression tests.

Wouldn't it be better to move this stuff from here and the regress Makefile
into Makefile.global.in?

Possibly. What difference does it make?

--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

#4Andres Freund
andres@anarazel.de
In reply to: Robert Haas (#3)
Re: pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On 2016-02-27 07:43:15 +0530, Robert Haas wrote:

On Sat, Feb 27, 2016 at 6:19 AM, Andrew Dunstan <andrew@dunslane.net> wrote:

On 02/26/2016 02:10 AM, Robert Haas wrote:

Respect TEMP_CONFIG when running contrib regression tests.

Wouldn't it be better to move this stuff from here and the regress Makefile
into Makefile.global.in?

Possibly. What difference does it make?

Less duplication?

--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

#5Robert Haas
robertmhaas@gmail.com
In reply to: Andres Freund (#4)
Re: pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On Sat, Feb 27, 2016 at 7:47 AM, Andres Freund <andres@anarazel.de> wrote:

On 2016-02-27 07:43:15 +0530, Robert Haas wrote:

On Sat, Feb 27, 2016 at 6:19 AM, Andrew Dunstan <andrew@dunslane.net> wrote:

On 02/26/2016 02:10 AM, Robert Haas wrote:

Respect TEMP_CONFIG when running contrib regression tests.

Wouldn't it be better to move this stuff from here and the regress Makefile
into Makefile.global.in?

Possibly. What difference does it make?

Less duplication?

Sure. Saving three lines of Makefile duplication is hardly a
world-shattering event, so I thought there might be some other
purpose. But I'm not against saving three lines of duplication
either, if it won't break anything.

--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

#6Andrew Dunstan
andrew@dunslane.net
In reply to: Robert Haas (#5)
Re: pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On 02/26/2016 09:21 PM, Robert Haas wrote:

On Sat, Feb 27, 2016 at 7:47 AM, Andres Freund <andres@anarazel.de> wrote:

On 2016-02-27 07:43:15 +0530, Robert Haas wrote:

On Sat, Feb 27, 2016 at 6:19 AM, Andrew Dunstan <andrew@dunslane.net> wrote:

On 02/26/2016 02:10 AM, Robert Haas wrote:

Respect TEMP_CONFIG when running contrib regression tests.

Wouldn't it be better to move this stuff from here and the regress Makefile
into Makefile.global.in?

Possibly. What difference does it make?

Less duplication?

Sure. Saving three lines of Makefile duplication is hardly a
world-shattering event, so I thought there might be some other
purpose. But I'm not against saving three lines of duplication
either, if it won't break anything.

The point is that we should do this for several other test sets as well
as contrib - isolation tests, PL tests and ecpg tests.

cheers

andrew

--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

#7Robert Haas
robertmhaas@gmail.com
In reply to: Andrew Dunstan (#6)
Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On Sat, Feb 27, 2016 at 9:00 AM, Andrew Dunstan <andrew@dunslane.net> wrote:

Sure. Saving three lines of Makefile duplication is hardly a
world-shattering event, so I thought there might be some other
purpose. But I'm not against saving three lines of duplication
either, if it won't break anything.

The point is that we should do this for several other test sets as well as
contrib - isolation tests, PL tests and ecpg tests.

OK, I was wondering about that. I can try to write a patch, or
someone else can, but if you already understand what needs to be done,
perhaps you should just go ahead.

--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

#8Andrew Dunstan
andrew@dunslane.net
In reply to: Robert Haas (#7)
Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On 02/26/2016 10:59 PM, Robert Haas wrote:

On Sat, Feb 27, 2016 at 9:00 AM, Andrew Dunstan <andrew@dunslane.net> wrote:

Sure. Saving three lines of Makefile duplication is hardly a
world-shattering event, so I thought there might be some other
purpose. But I'm not against saving three lines of duplication
either, if it won't break anything.

The point is that we should do this for several other test sets as well as
contrib - isolation tests, PL tests and ecpg tests.

OK, I was wondering about that. I can try to write a patch, or
someone else can, but if you already understand what needs to be done,
perhaps you should just go ahead.

What I had in mind was something like the attached.

In testing this seems to do the right thing, and the nice part is that
it will be picked up by the buildfarm in the one case that's relevant,
namely the ecpg tests.

The only fly in the ointment is that there are a few places that set
--temp-config explicitly:

./contrib/test_decoding/Makefile: --temp-config
$(top_srcdir)/contrib/test_decoding/logical.conf \
./contrib/test_decoding/Makefile: --temp-config
$(top_srcdir)/contrib/test_decoding/logical.conf \
./src/test/modules/commit_ts/Makefile:REGRESS_OPTS =
--temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
./src/test/modules/test_rls_hooks/Makefile:REGRESS_OPTS =
--temp-config=$(top_srcdir)/src/test/modules/test_rls_hooks/rls_hooks.conf

Perhaps what we need to do is modify pg_regress.c slightly to allow more
than one --temp-config argument. But that could be done later.

cheers

andrew

Attachments:

regress-temp-config.patchtext/x-patch; name=regress-temp-config.patchDownload+12-17
#9Robert Haas
robertmhaas@gmail.com
In reply to: Andrew Dunstan (#8)
Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On Sat, Feb 27, 2016 at 7:08 PM, Andrew Dunstan <andrew@dunslane.net> wrote:

What I had in mind was something like the attached.

In testing this seems to do the right thing, and the nice part is that it
will be picked up by the buildfarm in the one case that's relevant, namely
the ecpg tests.

The only fly in the ointment is that there are a few places that set
--temp-config explicitly:

./contrib/test_decoding/Makefile: --temp-config
$(top_srcdir)/contrib/test_decoding/logical.conf \
./contrib/test_decoding/Makefile: --temp-config
$(top_srcdir)/contrib/test_decoding/logical.conf \
./src/test/modules/commit_ts/Makefile:REGRESS_OPTS =
--temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
./src/test/modules/test_rls_hooks/Makefile:REGRESS_OPTS =

--temp-config=$(top_srcdir)/src/test/modules/test_rls_hooks/rls_hooks.conf

Perhaps what we need to do is modify pg_regress.c slightly to allow more
than one --temp-config argument. But that could be done later.

Well, I'm pretty interested in using --temp-config for parallelism
testing; I want to be able to run the whole regression test suite with
a given --temp-config. I'm in agreement with this change but if it
doesn't play well with that need, I suppose I'll be writing that
pg_regress.c patch sooner rather than later.

--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

#10Andrew Dunstan
andrew@dunslane.net
In reply to: Robert Haas (#9)
Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On 02/27/2016 09:25 AM, Robert Haas wrote:

On Sat, Feb 27, 2016 at 7:08 PM, Andrew Dunstan <andrew@dunslane.net> wrote:

What I had in mind was something like the attached.

In testing this seems to do the right thing, and the nice part is that it
will be picked up by the buildfarm in the one case that's relevant, namely
the ecpg tests.

The only fly in the ointment is that there are a few places that set
--temp-config explicitly:

./contrib/test_decoding/Makefile: --temp-config
$(top_srcdir)/contrib/test_decoding/logical.conf \
./contrib/test_decoding/Makefile: --temp-config
$(top_srcdir)/contrib/test_decoding/logical.conf \
./src/test/modules/commit_ts/Makefile:REGRESS_OPTS =
--temp-config=$(top_srcdir)/src/test/modules/commit_ts/commit_ts.conf
./src/test/modules/test_rls_hooks/Makefile:REGRESS_OPTS =

--temp-config=$(top_srcdir)/src/test/modules/test_rls_hooks/rls_hooks.conf

Perhaps what we need to do is modify pg_regress.c slightly to allow more
than one --temp-config argument. But that could be done later.

Well, I'm pretty interested in using --temp-config for parallelism
testing; I want to be able to run the whole regression test suite with
a given --temp-config. I'm in agreement with this change but if it
doesn't play well with that need, I suppose I'll be writing that
pg_regress.c patch sooner rather than later.

"doesn't meet your need" is probably a better way of putting it. The
facility's use has grown beyond what I originally envisaged, so I think
we will need that patch.

Would you like me to apply what I have?

cheers

andrew

--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

#11Robert Haas
robertmhaas@gmail.com
In reply to: Andrew Dunstan (#10)
Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On Sat, Feb 27, 2016 at 8:36 PM, Andrew Dunstan <andrew@dunslane.net> wrote:

"doesn't meet your need" is probably a better way of putting it. The
facility's use has grown beyond what I originally envisaged, so I think we
will need that patch.

Would you like me to apply what I have?

Go for it.

--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

#12John Gorman
johngorman2@gmail.com
In reply to: Robert Haas (#9)
Re: Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On Sat, Feb 27, 2016 at 9:25 AM, Robert Haas <robertmhaas@gmail.com> wrote:

On Sat, Feb 27, 2016 at 7:08 PM, Andrew Dunstan <andrew@dunslane.net>
wrote:

Perhaps what we need to do is modify pg_regress.c slightly to allow more
than one --temp-config argument. But that could be done later.

Well, I'm pretty interested in using --temp-config for parallelism
testing; I want to be able to run the whole regression test suite with
a given --temp-config. I'm in agreement with this change but if it
doesn't play well with that need, I suppose I'll be writing that
pg_regress.c patch sooner rather than later.

Here is a patch to allow pg_regress to include several --temp-config files.

Attachments:

pg_regress-temp-configs-v1.patchapplication/octet-stream; name=pg_regress-temp-configs-v1.patchDownload+4-3
#13Andrew Dunstan
andrew@dunslane.net
In reply to: John Gorman (#12)
Re: Re: [COMMITTERS] pgsql: Respect TEMP_CONFIG when running contrib regression tests.

On 02/27/2016 01:24 PM, John Gorman wrote:

On Sat, Feb 27, 2016 at 9:25 AM, Robert Haas <robertmhaas@gmail.com
<mailto:robertmhaas@gmail.com>> wrote:

On Sat, Feb 27, 2016 at 7:08 PM, Andrew Dunstan
<andrew@dunslane.net <mailto:andrew@dunslane.net>> wrote:

Perhaps what we need to do is modify pg_regress.c slightly to

allow more

than one --temp-config argument. But that could be done later.

Well, I'm pretty interested in using --temp-config for parallelism
testing; I want to be able to run the whole regression test suite with
a given --temp-config. I'm in agreement with this change but if it
doesn't play well with that need, I suppose I'll be writing that
pg_regress.c patch sooner rather than later.

Here is a patch to allow pg_regress to include several --temp-config
files.

Thanks, wonderfully small patch. Applied.

cheers

andrew

--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers