Re: make installcheck on non-default ports

Поиск
Список
Период
Сортировка
От Joe Conway
Тема Re: make installcheck on non-default ports
Дата
Msg-id 3FC42F8E.4010303@joeconway.com
обсуждение исходный текст
Ответ на make installcheck on non-default ports  (Joe Conway <mail@joeconway.com>)
Список pgsql-patches
Joe Conway wrote:
> I was trying to set up my dev box for multiple simultaneous Postgres
> installs (7.3 stable, 7.4 stable, cvs head) and discovered that
> `make installcheck` did not honor the default port assigned at configure
> time. I view this as a bug.
>
> The attached resolves the issue for all three versions.
>
> Any objections to me applying this to cvs head? What about 7.3 and 7.4
> stable branches?

BTW, a similar change is needed in contrib/contrib-global.mk so that
`make installcheck` will work for contrib. New patch attached.

Joe


Index: contrib/contrib-global.mk
===================================================================
RCS file: /cvsroot/pgsql-server/contrib/contrib-global.mk,v
retrieving revision 1.5
diff -c -r1.5 contrib-global.mk
*** contrib/contrib-global.mk   2 Nov 2002 00:16:21 -0000       1.5
--- contrib/contrib-global.mk   26 Nov 2003 04:42:55 -0000
***************
*** 209,215 ****

  # against installed postmaster
  installcheck: submake
!       $(top_builddir)/src/test/regress/pg_regress $(REGRESS)

  # in-tree test doesn't work yet (no way to install my shared library)
  #check: all submake
--- 209,215 ----

  # against installed postmaster
  installcheck: submake
!       $(top_builddir)/src/test/regress/pg_regress --port=$(DEF_PGPORT) $(REGRESS)

  # in-tree test doesn't work yet (no way to install my shared library)
  #check: all submake
Index: src/test/regress/GNUmakefile
===================================================================
RCS file: /cvsroot/pgsql-server/src/test/regress/GNUmakefile,v
retrieving revision 1.43
diff -c -r1.43 GNUmakefile
*** src/test/regress/GNUmakefile    2 Nov 2003 21:56:15 -0000    1.43
--- src/test/regress/GNUmakefile    26 Nov 2003 04:00:38 -0000
***************
*** 122,128 ****
      $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule
--multibyte=$(MULTIBYTE)$(MAXCONNOPT) 

  installcheck: all
!     $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)


  # old interfaces follow...
--- 122,128 ----
      $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule
--multibyte=$(MULTIBYTE)$(MAXCONNOPT) 

  installcheck: all
!     $(SHELL) ./pg_regress --port=$(DEF_PGPORT) --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)


  # old interfaces follow...
***************
*** 131,137 ****
  runtest: installcheck

  bigtest:
!     $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) numeric_big

  bigcheck:
      $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule
--multibyte=$(MULTIBYTE)$(MAXCONNOPT) numeric_big 
--- 131,137 ----
  runtest: installcheck

  bigtest:
!     $(SHELL) ./pg_regress --port=$(DEF_PGPORT) --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)
numeric_big

  bigcheck:
      $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule
--multibyte=$(MULTIBYTE)$(MAXCONNOPT) numeric_big 

В списке pgsql-patches по дате отправления:

Предыдущее
От: Joe Conway
Дата:
Сообщение: make installcheck on non-default ports
Следующее
От: Tom Lane
Дата:
Сообщение: Re: make installcheck on non-default ports