mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change build of regress.so to use Makefile.shlib instead of depending

Browse Source 
on the not-very-good .so pattern rules in the port-specific Makefiles.
(This leaves only pgxs' MODULES case needing those rules.)  Also,
compile pgsleep.c locally and add it to regress.so to avoid failure
on AIX.
This commit is contained in:
Tom Lane 2005-07-25 00:58:27 +00:00
parent ac652466ec
commit cb504a41b2
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/test/regress/GNUmakefile
View File

@ -1,13 +1,12 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# GNUmakefile-- # GNUmakefile--
# Makefile for regress (the regression tests) # Makefile for src/test/regress (the regression tests)
# #
# Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
# #
# # $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.51 2005/07/25 00:58:27 tgl Exp $
# IDENTIFICATION
# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.50 2005/07/17 18:28:45 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -17,11 +16,6 @@ include $(top_builddir)/src/Makefile.global
contribdir := $(top_builddir)/contrib contribdir := $(top_builddir)/contrib
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
override CFLAGS += $(CFLAGS_SL)
SHLIB_LINK = $(BE_DLLLIBS)
# port number for temp-installation test postmaster # port number for temp-installation test postmaster
TEMP_PORT = 5$(DEF_PGPORT) TEMP_PORT = 5$(DEF_PGPORT)
@ -59,13 +53,28 @@ pg_regress: pg_regress.sh GNUmakefile $(top_builddir)/src/Makefile.global
# Build dynamically-loaded object file for CREATE FUNCTION ... LANGUAGE 'C'. # Build dynamically-loaded object file for CREATE FUNCTION ... LANGUAGE 'C'.
DLOBJS := regress$(DLSUFFIX) NAME = regress
# This is for some platforms SO_MAJOR_VERSION= 0
ifdef EXPSUFF SO_MINOR_VERSION= 0
DLOBJS += regress$(EXPSUFF) OBJS = regress.o pgsleep.o
endif SHLIB_LINK = $(BE_DLLLIBS)
all: $(DLOBJS) include $(top_srcdir)/src/Makefile.shlib
all: $(NAME)$(DLSUFFIX)
$(NAME)$(DLSUFFIX): $(shlib)
rm -f $(NAME)$(DLSUFFIX)
$(LN_S) $(shlib) $(NAME)$(DLSUFFIX)
# regress.so needs pg_usleep, which on some platforms can't be linked
# from the main backend (though I'd sure like to know why not).
# We can't incorporate libpgport directly either, since it's not built
# with appropriate options to build a shared lib. Instead,
# symlink the source file in here and build our own object file.
pgsleep.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< .
# Build test input and expected files # Build test input and expected files
@ -163,10 +172,11 @@ bigcheck:
## Clean up ## Clean up
## ##
clean distclean maintainer-clean: clean distclean maintainer-clean: clean-lib
# things built by `all' target # things built by `all' target
rm -f $(NAME)$(DLSUFFIX) $(OBJS) pgsleep.c
$(MAKE) -C $(contribdir)/spi clean $(MAKE) -C $(contribdir)/spi clean
rm -f $(output_files) $(input_files) $(DLOBJS) regress.o pg_regress rm -f $(output_files) $(input_files) pg_regress
# things created by various check targets # things created by various check targets
rm -rf testtablespace rm -rf testtablespace
rm -rf results tmp_check log rm -rf results tmp_check log