mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-17 19:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move pg_test_timing from contrib/ to src/bin/

Browse Source 
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
Peter Eisentraut 2015-03-10 22:33:24 -04:00
parent d992f8a896
commit 528c2e44ab
12 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/Makefile
View File

@ -33,7 +33,6 @@ SUBDIRS = \
pg_prewarm \
pg_standby \
pg_stat_statements \
pg_test_timing \
pg_trgm \
pgcrypto \
pgrowlocks \

18
contrib/pg_test_timing/Makefile
View File

@ -1,18 +0,0 @@
# contrib/pg_test_timing/Makefile
PGFILEDESC = "pg_test_timing - test timing overhead"
PGAPPICON = win32
PROGRAM = pg_test_timing
OBJS = pg_test_timing.o $(WIN32RES)
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = contrib/pg_test_timing
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif

1
doc/src/sgml/contrib.sgml
View File

@ -202,7 +202,6 @@ pages.
</para>
&pgstandby;
&pgtesttiming;
&pgxlogdump;
</sect1>
</appendix>

1
doc/src/sgml/filelist.sgml
View File

@ -133,7 +133,6 @@
<!ENTITY pgstandby SYSTEM "pgstandby.sgml">
<!ENTITY pgstatstatements SYSTEM "pgstatstatements.sgml">
<!ENTITY pgstattuple SYSTEM "pgstattuple.sgml">
<!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml">
<!ENTITY pgtrgm SYSTEM "pgtrgm.sgml">
<!ENTITY pgxlogdump SYSTEM "pg_xlogdump.sgml">
<!ENTITY postgres-fdw SYSTEM "postgres-fdw.sgml">

1
doc/src/sgml/ref/allfiles.sgml
View File

@ -194,6 +194,7 @@ Complete list of usable sgml source files in this directory.
<!ENTITY pgRestore SYSTEM "pg_restore.sgml">
<!ENTITY pgRewind SYSTEM "pg_rewind.sgml">
<!ENTITY pgtestfsync SYSTEM "pgtestfsync.sgml">
<!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml">
<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml">
<!ENTITY postgres SYSTEM "postgres-ref.sgml">
<!ENTITY postmaster SYSTEM "postmaster.sgml">

10
doc/src/sgml/pgtesttiming.sgml → doc/src/sgml/ref/pgtesttiming.sgml
View File

@ -1,4 +1,4 @@
<!-- doc/src/sgml/pgtesttiming.sgml -->
<!-- doc/src/sgml/ref/pgtesttiming.sgml -->
<refentry id="pgtesttiming">
<indexterm zone="pgtesttiming">
@ -290,14 +290,6 @@ Histogram of timing durations:
</refsect2>
</refsect1>
<refsect1>
<title>Author</title>
<para>
Ants Aasma <email>ants.aasma@eesti.ee</email>
</para>
</refsect1>
<refsect1>
<title>See Also</title>

1
doc/src/sgml/reference.sgml
View File

@ -264,6 +264,7 @@
&pgResetxlog;
&pgRewind;
&pgtestfsync;
&pgtesttiming;
&pgupgrade;
&postgres;
&postmaster;

1
src/bin/Makefile
View File

@ -24,6 +24,7 @@ SUBDIRS = \
pg_resetxlog \
pg_rewind \
pg_test_fsync \
pg_test_timing \
pg_upgrade \
pgbench \
psql \

0
contrib/pg_test_timing/.gitignore → src/bin/pg_test_timing/.gitignore vendored
View File

27
src/bin/pg_test_timing/Makefile Normal file
View File

@ -0,0 +1,27 @@
# src/bin/pg_test_timing/Makefile
PGFILEDESC = "pg_test_timing - test timing overhead"
PGAPPICON = win32
subdir = src/bin/pg_test_timing
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pg_test_timing.o $(WIN32RES)
all: pg_test_timing
pg_test_timing: $(OBJS) | submake-libpgport
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
install: all installdirs
$(INSTALL_PROGRAM) pg_test_timing$(X) '$(DESTDIR)$(bindir)/pg_test_timing$(X)'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(bindir)'
uninstall:
rm -f '$(DESTDIR)$(bindir)/pg_test_timing$(X)'
clean distclean maintainer-clean:
rm -f pg_test_timing$(X) $(OBJS)

0
contrib/pg_test_timing/pg_test_timing.c → src/bin/pg_test_timing/pg_test_timing.c
View File

6
src/tools/msvc/Mkvcbuild.pm
View File

@ -35,13 +35,11 @@ my @contrib_uselibpq =
my @contrib_uselibpgport = (
'oid2name',
'pg_standby',
'pg_test_timing',
'pg_xlogdump',
'vacuumlo');
my @contrib_uselibpgcommon = (
'oid2name',
'pg_standby',
'pg_test_timing',
'pg_xlogdump',
'vacuumlo');
my $contrib_extralibs = undef;
@ -55,8 +53,8 @@ my @contrib_excludes = ('pgcrypto', 'commit_ts', 'intagg', 'sepgsql');
# Set of variables for frontend modules
my $frontend_defines = { 'initdb' => 'FRONTEND' };
my @frontend_uselibpq = ('pg_ctl', 'pg_upgrade', 'pgbench', 'psql');
my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_upgrade', 'pgbench' );
my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_upgrade', 'pgbench' );
my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_test_timing', 'pg_upgrade', 'pgbench' );
my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_test_timing', 'pg_upgrade', 'pgbench' );
my $frontend_extralibs = {
'initdb' => ['ws2_32.lib'],
'pg_restore' => ['ws2_32.lib'],