diff options
author | Peter Eisentraut | 2015-03-11 02:33:24 +0000 |
---|---|---|
committer | Peter Eisentraut | 2015-04-21 01:30:12 +0000 |
commit | 528c2e44ab0a5ba49a5a04689dae3f674b71c15e (patch) | |
tree | 89ffd862071c596ee5ab36710f6982ff013084e9 | |
parent | d992f8a8961c09ec219373ffe2b5e6473febd065 (diff) |
Move pg_test_timing from contrib/ to src/bin/
Reviewed-by: Michael Paquier <[email protected]>
-rw-r--r-- | contrib/Makefile | 1 | ||||
-rw-r--r-- | contrib/pg_test_timing/Makefile | 18 | ||||
-rw-r--r-- | doc/src/sgml/contrib.sgml | 1 | ||||
-rw-r--r-- | doc/src/sgml/filelist.sgml | 1 | ||||
-rw-r--r-- | doc/src/sgml/ref/allfiles.sgml | 1 | ||||
-rw-r--r-- | doc/src/sgml/ref/pgtesttiming.sgml (renamed from doc/src/sgml/pgtesttiming.sgml) | 10 | ||||
-rw-r--r-- | doc/src/sgml/reference.sgml | 1 | ||||
-rw-r--r-- | src/bin/Makefile | 1 | ||||
-rw-r--r-- | src/bin/pg_test_timing/.gitignore (renamed from contrib/pg_test_timing/.gitignore) | 0 | ||||
-rw-r--r-- | src/bin/pg_test_timing/Makefile | 27 | ||||
-rw-r--r-- | src/bin/pg_test_timing/pg_test_timing.c (renamed from contrib/pg_test_timing/pg_test_timing.c) | 0 | ||||
-rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 6 |
12 files changed, 33 insertions, 34 deletions
diff --git a/contrib/Makefile b/contrib/Makefile index 9ca1ed707a..e5ce0be5fd 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -33,7 +33,6 @@ SUBDIRS = \ pg_prewarm \ pg_standby \ pg_stat_statements \ - pg_test_timing \ pg_trgm \ pgcrypto \ pgrowlocks \ diff --git a/contrib/pg_test_timing/Makefile b/contrib/pg_test_timing/Makefile deleted file mode 100644 index 8b37aa8249..0000000000 --- a/contrib/pg_test_timing/Makefile +++ /dev/null @@ -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 diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml index b25d18b344..29e4f2df9b 100644 --- a/doc/src/sgml/contrib.sgml +++ b/doc/src/sgml/contrib.sgml @@ -202,7 +202,6 @@ pages. </para> &pgstandby; - &pgtesttiming; &pgxlogdump; </sect1> </appendix> diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml index 5095e0fce2..2f4896d4ce 100644 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@ -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"> diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index e940153540..0e0a1f4f46 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -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"> diff --git a/doc/src/sgml/pgtesttiming.sgml b/doc/src/sgml/ref/pgtesttiming.sgml index a6ab9b114b..d5e231fff7 100644 --- a/doc/src/sgml/pgtesttiming.sgml +++ b/doc/src/sgml/ref/pgtesttiming.sgml @@ -1,4 +1,4 @@ -<!-- doc/src/sgml/pgtesttiming.sgml --> +<!-- doc/src/sgml/ref/pgtesttiming.sgml --> <refentry id="pgtesttiming"> <indexterm zone="pgtesttiming"> @@ -291,14 +291,6 @@ Histogram of timing durations: </refsect1> <refsect1> - <title>Author</title> - - <para> - Ants Aasma <email>[email protected]</email> - </para> - </refsect1> - - <refsect1> <title>See Also</title> <simplelist type="inline"> diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 666493cd64..a526638ec9 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -264,6 +264,7 @@ &pgResetxlog; &pgRewind; &pgtestfsync; + &pgtesttiming; &pgupgrade; &postgres; &postmaster; diff --git a/src/bin/Makefile b/src/bin/Makefile index 06a0ab75b6..d23c95c581 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -24,6 +24,7 @@ SUBDIRS = \ pg_resetxlog \ pg_rewind \ pg_test_fsync \ + pg_test_timing \ pg_upgrade \ pgbench \ psql \ diff --git a/contrib/pg_test_timing/.gitignore b/src/bin/pg_test_timing/.gitignore index f6c664c765..f6c664c765 100644 --- a/contrib/pg_test_timing/.gitignore +++ b/src/bin/pg_test_timing/.gitignore diff --git a/src/bin/pg_test_timing/Makefile b/src/bin/pg_test_timing/Makefile new file mode 100644 index 0000000000..d1f35954f0 --- /dev/null +++ b/src/bin/pg_test_timing/Makefile @@ -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) diff --git a/contrib/pg_test_timing/pg_test_timing.c b/src/bin/pg_test_timing/pg_test_timing.c index e5c11de6bb..e5c11de6bb 100644 --- a/contrib/pg_test_timing/pg_test_timing.c +++ b/src/bin/pg_test_timing/pg_test_timing.c diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 5b86c805ae..6dd429a8b6 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -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'], |