Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4e77b4a

Browse files
committed
Readd test/regress/README file, this time with a well-defined and simple
rule to remake it when necessary.
1 parent35b7601 commit4e77b4a

File tree

7 files changed

+308
-60
lines changed

7 files changed

+308
-60
lines changed

‎doc/src/sgml/Makefile‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.39 2001/09/18 12:08:26 petere Exp $
11+
# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.40 2001/09/21 18:37:05 petere Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

@@ -148,10 +148,10 @@ $(addsuffix .tex, $(ALLBOOKS)): %.tex: %.sgml $(ALLSGML) stylesheet.dsl
148148

149149
JADE.text =$(JADE)$(JADEFLAGS)$(SGMLINCLUDE) -c$(CATALOG) -d stylesheet.dsl -i output-text -t sgml
150150

151-
INSTALLHISTORY:% :%.html
151+
INSTALLHISTORYregress_README:% :%.html
152152
@echo"|";\
153-
echo"| You should now take\`$<', save it as a text file in Netscape,";\
154-
echo"| and put it in place of the existing\`$@' file.";\
153+
echo"| You should now take'$<', save it as a text file in Netscape,";\
154+
echo"| and put it in place of the existing'$@' file.";\
155155
echo"|"
156156

157157
INSTALL.html: standalone-install.sgml installation.sgml
@@ -163,6 +163,13 @@ HISTORY.html: release.sgml
163163
$(JADE.text) -V nochunks tempfile_HISTORY.sgml>$@
164164
rm tempfile_HISTORY.sgml
165165

166+
regress_README.html: regress.sgml
167+
(echo'<!doctype chapter PUBLIC "-//OASIS//DTD DocBook V3.1//EN" ['; \
168+
echo'<!entity % standalone-ignore "IGNORE"> ]>';\
169+
cat$< )>tempfile_regress_README.sgml
170+
$(JADE.text) -V nochunks tempfile_regress_README.sgml>$@
171+
rm tempfile_regress_README.sgml
172+
166173

167174
##
168175
## Check

‎doc/src/sgml/docguide.sgml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.33 2001/09/13 15:55:22 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.34 2001/09/21 18:37:05 petere Exp $ -->
22

33
<appendix label="DG2" id="docguide">
44
<title>Documentation</title>
@@ -901,21 +901,9 @@ exit
901901

902902
<para>
903903
The file <filename>HISTORY</filename> can be created similarly,
904-
using the command <userinput>gmake HISTORY</userinput>. The table
905-
of contents should be removed manually from the resulting text
906-
file.
907-
</para>
908-
909-
<para>
910-
Since it does not change very often, the generation of the file
911-
<filename>src/test/regress/README</filename> is not fully
912-
automated. After building the <acronym>HTML</acronym> version of
913-
the <citetitle>Administrator's Guide</citetitle>, convert the
914-
resulting files <filename>regress.html</filename> and
915-
<filename>regress-platform.html</filename> to text, using
916-
<productname>Netscape</productname>. Then paste the text files
917-
together and edit them to taste (e.g., remove the navigation
918-
bars, remove the references to other chapters).
904+
using the command <userinput>gmake HISTORY</userinput>. For the
905+
file <filename>src/test/regress/README</filename> the command is
906+
<userinput>gmake regress_README</userinput>.
919907
</para>
920908

921909
<!--

‎doc/src/sgml/filelist.sgml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.15 2001/09/02 23:27:49 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/filelist.sgml,v 1.16 2001/09/21 18:37:05 petere Exp $ -->
22

33
<!entity history SYSTEM "history.sgml">
44
<!entity info SYSTEM "info.sgml">
@@ -100,6 +100,11 @@
100100
<!entity sources SYSTEM "sources.sgml">
101101
<!entity nls SYSTEM "nls.sgml">
102102

103-
<!-- see standalone-install.sgml about these -->
104-
<!entity % flattext-install-ignore "INCLUDE">
105-
<!entity % flattext-install-include "IGNORE">
103+
<!--
104+
Some parts of the documentation are also source for some plain-text
105+
files used during installation. To selectively ignore or include
106+
some parts (e.g., external xref's) when generating these files we use
107+
these parameter entities. See also standalone-install.sgml.
108+
-->
109+
<!entity % standalone-ignore "INCLUDE">
110+
<!entity % standalone-include "IGNORE">

‎doc/src/sgml/installation.sgml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.56 2001/09/16 16:11:09 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.57 2001/09/21 18:37:05 petere Exp $ -->
22

33
<chapter id="installation">
4-
<title><![%flattext-install-include[<productname>PostgreSQL</>]]>
4+
<title><![%standalone-include[<productname>PostgreSQL</>]]>
55
Installation Instructions</title>
66

77
<indexterm zone="installation">
@@ -27,8 +27,8 @@ su - postgres
2727
/usr/local/pgsql/bin/psql test
2828
</synopsis>
2929
The long version is the rest of this
30-
<![%flattext-install-include;[document.]]>
31-
<![%flattext-install-ignore;[chapter.]]>
30+
<![%standalone-include;[document.]]>
31+
<![%standalone-ignore;[chapter.]]>
3232
</para>
3333
</sect1>
3434

@@ -156,7 +156,7 @@ su - postgres
156156
</para>
157157
</sect1>
158158

159-
<![%flattext-install-ignore;[
159+
<![%standalone-ignore;[
160160
<sect1 id="install-getsource">
161161
<title>Getting The Source</title>
162162

@@ -221,8 +221,8 @@ su - postgres
221221
foreign keys), then use the <option>-o</option> option when running
222222
<command>pg_dumpall</>. <command>pg_dumpall</command> does not
223223
save large objects. Check
224-
<![%flattext-install-include[the <citetitle>Administrator's Guide</>]]>
225-
<![%flattext-install-ignore[<xref linkend="backup-dump-caveats">]]>
224+
<![%standalone-include[the <citetitle>Administrator's Guide</>]]>
225+
<![%standalone-ignore[<xref linkend="backup-dump-caveats">]]>
226226
if you need to do this.
227227
</para>
228228

@@ -290,8 +290,8 @@ su - postgres
290290
<para>
291291
You can also install the new version in parallel with the old one
292292
to decrease the downtime. These topics are discussed at length in
293-
<![%flattext-install-include[the <citetitle>Administrator's Guide</>,]]>
294-
<![%flattext-install-ignore[<xref linkend="migration">,]]>
293+
<![%standalone-include[the <citetitle>Administrator's Guide</>,]]>
294+
<![%standalone-ignore[<xref linkend="migration">,]]>
295295
which you are encouraged
296296
to read in any case.
297297
</para>
@@ -531,8 +531,8 @@ su - postgres
531531
<listitem>
532532
<para>
533533
Enables single-byte character set recode support. See
534-
<![%flattext-install-include[the <citetitle>Administrator's Guide</citetitle>]]>
535-
<![%flattext-install-ignore[<xref linkend="recode">]]> about this feature.
534+
<![%standalone-include[the <citetitle>Administrator's Guide</citetitle>]]>
535+
<![%standalone-ignore[<xref linkend="recode">]]> about this feature.
536536
</para>
537537
</listitem>
538538
</varlistentry>
@@ -544,8 +544,8 @@ su - postgres
544544
Allows the use of multibyte character encodings. This is
545545
primarily for languages like Japanese, Korean, and Chinese.
546546
Read
547-
<![%flattext-install-include[the <citetitle>Administrator's Guide</citetitle>]]>
548-
<![%flattext-install-ignore[<xref linkend="multibyte">]]>
547+
<![%standalone-include[the <citetitle>Administrator's Guide</citetitle>]]>
548+
<![%standalone-ignore[<xref linkend="multibyte">]]>
549549
for details.
550550
</para>
551551
</listitem>
@@ -902,10 +902,10 @@ All of PostgreSQL is successfully made. Ready to install.
902902
</screen>
903903
It is possible that some tests fail, due to differences in error
904904
message wording or floating point results.
905-
<![%flattext-install-include[The file
905+
<![%standalone-include[The file
906906
<filename>src/test/regress/README</> and the
907907
<citetitle>Administrator's Guide</citetitle> contain]]>
908-
<![%flattext-install-ignore[<xref linkend="regress"> contains]]>
908+
<![%standalone-ignore[<xref linkend="regress"> contains]]>
909909
detailed information about interpreting the test results. You can
910910
repeat this test at any later time by issuing the same command.
911911
</para>
@@ -1127,7 +1127,7 @@ MANPATH=$MANPATH:/usr/local/pgsql/man
11271127
</sect1>
11281128

11291129

1130-
<![%flattext-install-include;[
1130+
<![%standalone-include;[
11311131
<sect1 id="install-getting-started">
11321132
<title>Getting Started</title>
11331133

@@ -1634,8 +1634,8 @@ gunzip -c user.ps.gz \
16341634
<entry>2001-03-26, Magnus Hagander (<email>mha@sollentuna.net</email>)</entry>
16351635
<entry>
16361636
client-side libraries (<application>libpq</> and <application>psql</>) or ODBC/JDBC, no server-side;
1637-
<![%flattext-install-include[see Administrator's Guide]]>
1638-
<![%flattext-install-ignore[see <xref linkend="install-win32">]]>
1637+
<![%standalone-include[see Administrator's Guide]]>
1638+
<![%standalone-ignore[see <xref linkend="install-win32">]]>
16391639
for instructions
16401640
</entry>
16411641
</row>

‎doc/src/sgml/regress.sgml‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/regress.sgml,v 1.20 2001/09/11 02:24:52 ishii Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/regress.sgml,v 1.21 2001/09/21 18:37:05 petere Exp $ -->
22

33
<chapter id="regress">
44
<title id="regress-title">Regression Tests</title>
55

6-
<abstract>
7-
<para>
8-
Regression test instructions and analysis
9-
</para>
10-
</abstract>
6+
<sect1 id="regress-intro">
7+
<title>Introduction</title>
118

129
<para>
1310
The regression tests are a comprehensive set of tests for the SQL
@@ -20,6 +17,11 @@
2017
the regression tests are current for every official release.
2118
</para>
2219

20+
</sect1>
21+
22+
<sect1 id="regress-run">
23+
<title>Running the Tests</title>
24+
2325
<para>
2426
The regression test can be run against an already installed and
2527
running server, or using a temporary installation within the build
@@ -97,16 +99,17 @@
9799
</tip>
98100

99101
<para>
100-
To run the tests after installation (see <xref
101-
linkend="installation">),initialize a data area and start the
102-
server, as explained in <xref linkend="runtime">, then type
102+
To run the tests after installation<![%standalone-ignore;[ (see <xref linkend="installation">)]]>,
103+
initialize a data area and start the
104+
server,<![%standalone-ignore;[as explained in <xref linkend="runtime">, ]]> then type
103105
<screen>
104106
<prompt>$ </prompt><userinput>gmake installcheck</userinput>
105107
</screen>
106108
The tests will expect to contact the server at the local host and the
107109
default port number, unless directed otherwise by <envar>PGHOST</envar> and <envar>PGPORT</envar>
108110
environment variables.
109111
</para>
112+
</sect1>
110113

111114
<sect1 id="regress-evaluation">
112115
<title>Test Evaluation</title>
@@ -255,7 +258,7 @@ PGTZ='PST8PDT7,M04.01.0,M10.05.03'; export PGTZ
255258

256259
<para>
257260
Several of the tests involve operations on geographic data about
258-
the Oakland/Berkeley,CA street map. The map data is expressed as
261+
the Oakland/Berkeley,California street map. The map data is expressed as
259262
polygons whose vertices are represented as pairs of <type>double
260263
precision</type> numbers (decimal latitude and
261264
longitude). Initially, some tables are created and loaded with
@@ -277,15 +280,15 @@ SELECT * from iexit;
277280
</sect2>
278281

279282
<sect2>
280-
<title>Tuple ordering differences</title>
283+
<title>Row ordering differences</title>
281284

282285
<para>
283-
You might see differences in which the sametuples are output in a
286+
You might see differences in which the samerows are output in a
284287
different order than what appears in the expected file. In most cases
285288
this is not, strictly speaking, a bug. Most of the regression test
286289
scripts are not so pedantic as to use an ORDER BY for every single
287-
SELECT, and so their resulttuple orderings are not well-defined
288-
according to the letter of the SQLspec. In practice, since we are
290+
SELECT, and so their resultrow orderings are not well-defined
291+
according to the letter of the SQLspecification. In practice, since we are
289292
looking at the same queries being executed on the same data by the same
290293
software, we usually get the same result ordering on all platforms, and
291294
so the lack of ORDER BY isn't a problem. Some queries do exhibit
@@ -325,12 +328,13 @@ diff results/random.out expected/random.out
325328
not worry unless the random test always fails in repeated
326329
attempts. (On the other hand, if the random test is
327330
<emphasis>never</emphasis> reported to fail even in many trials
328-
of theregress tests, you probably <emphasis>should</emphasis>
331+
of theregression tests, you probably <emphasis>should</emphasis>
329332
worry.)
330333
</para>
331334
</sect2>
332335
</sect1>
333336

337+
<![%standalone-ignore;[
334338
<!-- We might want to move the following section into the developer's guide. -->
335339
<sect1 id="regress-platform">
336340
<title>Platform-specific comparison files</title>
@@ -384,6 +388,7 @@ horology/hppa=horology-no-DST-before-1970
384388
</para>
385389

386390
</sect1>
391+
]]>
387392

388393
</chapter>
389394

‎doc/src/sgml/standalone-install.sgml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/standalone-install.sgml,v 2.2 2000/11/30 21:44:07 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/standalone-install.sgml,v 2.3 2001/09/21 18:37:05 petere Exp $ -->
22

33
<!--
44
This file helps in generating the INSTALL text file that lives in the
@@ -32,8 +32,8 @@ equivalent of C's #ifdef and friends. The other end of this is in
3232
installation.sgml.
3333
-->
3434

35-
<!entity %flattext-install-ignore "IGNORE">
36-
<!entity %flattext-install-include "INCLUDE">
35+
<!entity %standalone-ignore "IGNORE">
36+
<!entity %standalone-include "INCLUDE">
3737

3838
<!--
3939
When you're building the Administrator's Guide, you want to flip the

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp