database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Make pg_regress.c get paths from pg_config_paths.h, instead of -D

Browse Source 
switches passed from the Makefile.  This looks like it will fix
problem with virtual vs real paths under msys.
This commit is contained in:
Tom Lane
2006-07-20 01:16:57 +00:00
parent 9dc842f083
commit 5652ea703b
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/regress/GNUmakefile
View File

@ -6,7 +6,7 @@
# Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.60 2006/07/19 17:02:59 tgl Exp $ # $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.61 2006/07/20 01:16:57 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -35,10 +35,7 @@ NOLOCALE += --no-locale
endif endif
# stuff to pass into build of pg_regress # stuff to pass into build of pg_regress
EXTRADEFS = '-DPGBINDIR="$(bindir)"' \ EXTRADEFS = '-DHOST_TUPLE="$(host_tuple)"' \
'-DLIBDIR="$(libdir)"' \
'-DPGSHAREDIR="$(datadir)"' \
'-DHOST_TUPLE="$(host_tuple)"' \
'-DMAKEPROG="$(MAKE)"' \ '-DMAKEPROG="$(MAKE)"' \
'-DSHELLPROG="$(SHELL)"' '-DSHELLPROG="$(SHELL)"'
@ -53,9 +50,12 @@ all: submake-libpgport pg_regress$(X)
pg_regress$(X): pg_regress.o pg_regress$(X): pg_regress.o
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
# depend on Makefile.global to ensure that symbol changes propagate # dependencies ensure that path changes propagate
pg_regress.o: pg_regress.c $(top_builddir)/src/Makefile.global pg_regress.o: pg_regress.c $(top_builddir)/src/port/pg_config_paths.h
$(CC) $(CFLAGS) $(CPPFLAGS) $(EXTRADEFS) -c -o $@ $< $(CC) $(CFLAGS) $(CPPFLAGS) -I$(top_builddir)/src/port $(EXTRADEFS) -c -o $@ $<
$(top_builddir)/src/port/pg_config_paths.h: $(top_builddir)/src/Makefile.global
$(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
install: pg_regress$(X) install: pg_regress$(X)
$(INSTALL_PROGRAM) pg_regress$(X) '$(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress$(X)' $(INSTALL_PROGRAM) pg_regress$(X) '$(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress$(X)'

11
src/test/regress/pg_regress.c
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.5 2006/07/19 17:02:59 tgl Exp $ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.6 2006/07/20 01:16:57 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,6 +25,7 @@
#include <unistd.h> #include <unistd.h>
#include "getopt_long.h" #include "getopt_long.h"
#include "pg_config_paths.h"
#ifndef WIN32 #ifndef WIN32
#define PID_TYPE pid_t #define PID_TYPE pid_t
@ -51,9 +52,11 @@ typedef struct _resultmap
} _resultmap; } _resultmap;
/* /*
* Values inserted from Makefile. (It might seem tempting to get the paths * Values obtained from pg_config_paths.h and Makefile. (It might seem
* via get_share_path() and friends, but that's not going to work because * tempting to get the paths via get_share_path() and friends, but that's
* pg_regress is typically not executed from an installed bin directory.) * not going to work because pg_regress is typically not executed from an
* installed bin directory. In any case, for our purposes the configured
* paths are what we want anyway.)
*/ */
static char *bindir = PGBINDIR; static char *bindir = PGBINDIR;
static char *libdir = LIBDIR; static char *libdir = LIBDIR;