Skip to content

P
Postgres FD Implementation
Commit b86ca72f authored by Tom Lane's avatar Tom Lane
Browse files
Options

Update platform-specific-expected-file support so that platforms can be 

specified by regular-expression patterns.  Add some more files.
parent 4f9d74f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1760 additions and 128 deletions
doc/src/sgml/regress.sgml
View file @ b86ca72f
......@@ -9,17 +9,15 @@ Regression test instructions and analysis.
<Para>
The PostgreSQL regression tests are a comprehensive set of tests for the
SQL implementation embedded in PostgreSQL developed by Jolly Chen and
Andrew Yu. It tests standard SQL operations as well as the extended
capabilities of PostgreSQL.
SQL implementation embedded in PostgreSQL. They test standard SQL
operations as well as the extended capabilities of PostgreSQL.
</Para>
<Para>
These tests have recently been revised by Marc Fournier and Thomas Lockhart
and are now packaged as
functional units which should make them easier to run and easier to interpret.
From <ProductName>PostgreSQL</ProductName> v6.1 onward
the regression tests are current for every official release.
The regression tests were originally developed by Jolly Chen and Andrew Yu,
and were extensively revised/repackaged by Marc Fournier and Thomas Lockhart.
From <ProductName>PostgreSQL</ProductName> v6.1 onward
the regression tests are current for every official release.
</Para>
<Para>
......@@ -66,19 +64,18 @@ The runtime path is /usr/local/pgsql (other paths are possible).
<Title>Regression Environment</Title>
<Para>
The regression test is invoked by the <Command>make</Command> command which compiles
a <Acronym>C</Acronym> program into a shared library
in the current directory. Localized shell scripts are also created in
the current directory. The output file templates are massaged into the
<FileName>./expected/*.out</FileName> files. The localization replaces macros in the source
files with absolute pathnames and user names.
To prepare for regression testing, do <Command>make all</Command> in the regression test
directory. This compiles a <Acronym>C</Acronym> program with PostgreSQL extension functions
into a shared library. Localized SQL scripts and output-comparison
files are also created for the tests that need them. The localization
replaces macros in the source files with absolute pathnames and user names.
</Para>
<Para>
Normally, the regression test should be run as the pg_superuser since
Normally, the regression tests should be run as the postgres user since
the 'src/test/regress' directory and sub-directories are owned by the
pg_superuser. If you run the regression test as another user the
'src/test/regress' directory tree should be writeable to that user.
postgres user. If you run the regression test as another user the
'src/test/regress' directory tree must be writeable to that user.
</Para>
<Para>
......@@ -132,7 +129,7 @@ The runtime path is /usr/local/pgsql (other paths are possible).
expected/ . .out files that represent what we *expect* the results to
look like
results/ .. .out files that represent what the results *actually* look
results/ .. .out files that contain what the results *actually* look
like. Also used as temporary storage for table copy testing.
</ProgramListing>
</Para>
......@@ -296,25 +293,6 @@ The runtime path is /usr/local/pgsql (other paths are possible).
</Sect2>
<Sect2>
<Title>OID differences</Title>
<Para>
There are several places where PostgreSQL OID (object identifiers) appear
in 'regress.out'. OID's are unique 32-bit integers which are generated
by the PostgreSQL backend whenever a table row is inserted or updated.
If you run the regression test on a non-virgin database or run it multiple
times, the OID's reported will have different values.
The following SQL statements in 'misc.out' have shown this behavior:
QUERY: SELECT user_relns() AS user_relns ORDER BY user_relns;
The 'a,523676' row is composed from an OID.
</Para>
</Sect2>
<Sect2>
<Title>Date and time differences</Title>
......@@ -431,5 +409,55 @@ The runtime path is /usr/local/pgsql (other paths are possible).
</Sect2>
</Sect1>
<Sect1>
<Title>Platform-specific comparison files</Title>
<Para>
Since some of the tests inherently produce platform-specific results,
we have provided a way to supply platform-specific result comparison
files. Frequently, the same variation applies to multiple platforms;
rather than supplying a separate comparison file for every platform,
there is a mapping file that defines which comparison file to use.
So, to eliminate bogus test "failures" for a particular platform,
you must choose or make a variant result file, and then add a line
to the mapping file, which is "resultmap".
</Para>
<Para>
Each line in the mapping file is of the form
<ProgramListing>
testname/platformnamepattern=comparisonfilename
</ProgramListing>
The test name is just the name of the particular regression test module.
The platform name pattern is a pattern in the style of expr(1) (that is,
a regular expression with an implicit ^ anchor at the start). It is matched
against the platform name as printed by config.guess. The comparison
file name is the name of the substitute result comparison file.
</Para>
<Para>
For example: the int2 regress test includes a deliberate entry of a value
that is too large to fit in int2. The specific error message that is
produced is platform-dependent; our reference platform emits
<ProgramListing>
ERROR: pg_atoi: error reading "100000": Numerical result out of range
</ProgramListing>
but a fair number of other Unix platforms emit
<ProgramListing>
ERROR: pg_atoi: error reading "100000": Result too large
</ProgramListing>
Therefore, we provide a variant comparison file, int2-too-large.out,
that includes this spelling of the error message. To silence the
bogus "failure" message on HPPA platforms, resultmap includes
<ProgramListing>
int2/hppa=int2-too-large
</ProgramListing>
which will trigger on any machine for which config.guess's output
begins with 'hppa'. Other lines in resultmap select the variant
comparison file for other platforms where it's appropriate.
</Para>
</Sect1>
</Chapter>
src/test/regress/README
View file @ b86ca72f
......@@ -3,10 +3,12 @@ Introduction
The PostgreSQL regression tests are a comprehensive set of tests for the
SQL implementation embedded in PostgreSQL. They test standard SQL
operations as well as the extensibility capabilities of PostgreSQL.
operations as well as the extended capabilities of PostgreSQL.
The regression tests were originally developed by Jolly Chen and Andrew Yu,
and were extensively revised/repackaged by Marc Fournier and Thomas Lockhart.
From PostgreSQL v6.1 onward the regression tests are current for every
official release.
Some properly installed and fully functional PostgreSQL installations
can fail some of these regression tests due to artifacts of floating point
......@@ -17,12 +19,17 @@ Introduction
Preparation
To prepare for regression testing, do "make all". This compiles
a 'C' program with PostgreSQL extension functions into a shared library
in the current directory. Localized SQL scripts and output-comparison
To prepare for regression testing, do "make all" in the regression test
directory. This compiles a 'C' program with PostgreSQL extension functions
into a shared library. Localized SQL scripts and output-comparison
files are also created for the tests that need them. The localization
replaces macros in the source files with absolute pathnames and user names.
Normally, the regression tests should be run as the postgres user since
the 'src/test/regress' directory and sub-directories are owned by the
postgres user. If you run the regression test as another user the
'src/test/regress' directory tree must be writeable to that user.
It was formerly necessary to run the postmaster with system time zone
set to PST, but this is no longer required. You can run the regression
tests under your normal postmaster configuration. The test script will
......@@ -64,11 +71,6 @@ Running the regression test
need an already-installed postmaster. Instead, runcheck creates
a temporary installation under the regress directory.
Normally, the regression tests should be run as the postgres user since
the 'src/test/regress' directory and sub-directories are owned by the
postgres user. If you run the regression test as another user the
'src/test/regress' directory tree must be writeable to that user.
Comparing expected/actual output
The results are in files in the ./results directory. These results
......@@ -172,11 +174,12 @@ Platform-specific comparison files
to the mapping file, which is "resultmap".
Each line in the mapping file is of the form
testname/platformname=comparisonfilename
testname/platformnamepattern=comparisonfilename
The test name is just the name of the particular regression test module.
The platform name is the platform name as printed by config.guess (in
the toplevel PostgreSQL src directory), or any prefix of it. The
comparison file name is the name of the substitute result comparison file.
The platform name pattern is a pattern in the style of expr(1) (that is,
a regular expression with an implicit ^ anchor at the start). It is matched
against the platform name as printed by config.guess. The comparison
file name is the name of the substitute result comparison file.
For example: the int2 regress test includes a deliberate entry of a value
that is too large to fit in int2. The specific error message that is
......
src/test/regress/expected/geometry-hppa1.1.out 0 → 100644
View file @ b86ca72f
This diff is collapsed.
src/test/regress/expected/geometry-i86-gnulibc.out 0 → 100644
View file @ b86ca72f
This diff is collapsed.
src/test/regress/expected/int2-not-representable.out 0 → 100644
View file @ b86ca72f
--
-- INT2
-- NOTE: int2 operators never check for over/underflow!
-- Some of these answers are consequently numerically incorrect.
--
CREATE TABLE INT2_TBL(f1 int2);
INSERT INTO INT2_TBL(f1) VALUES ('0');
INSERT INTO INT2_TBL(f1) VALUES ('1234');
INSERT INTO INT2_TBL(f1) VALUES ('-1234');
INSERT INTO INT2_TBL(f1) VALUES ('34.5');
ERROR: pg_atoi: error in "34.5": can't parse ".5"
-- largest and smallest values
INSERT INTO INT2_TBL(f1) VALUES ('32767');
INSERT INTO INT2_TBL(f1) VALUES ('-32767');
-- bad input values -- should give warnings
INSERT INTO INT2_TBL(f1) VALUES ('100000');
ERROR: pg_atoi: error reading "100000": Math result not representable
INSERT INTO INT2_TBL(f1) VALUES ('asdf');
ERROR: pg_atoi: error in "asdf": can't parse "asdf"
SELECT '' AS five, INT2_TBL.*;
five | f1
------+--------
| 0
| 1234
| -1234
| 32767
| -32767
(5 rows)
SELECT '' AS four, i.* FROM INT2_TBL i WHERE i.f1 <> int2 '0';
four | f1
------+--------
| 1234
| -1234
| 32767
| -32767
(4 rows)
SELECT '' AS four, i.* FROM INT2_TBL i WHERE i.f1 <> int4 '0';
four | f1
------+--------
| 1234
| -1234
| 32767
| -32767
(4 rows)
SELECT '' AS one, i.* FROM INT2_TBL i WHERE i.f1 = int2 '0';
one | f1
-----+----
| 0
(1 row)
SELECT '' AS one, i.* FROM INT2_TBL i WHERE i.f1 = int4 '0';
one | f1
-----+----
| 0
(1 row)
SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 < int2 '0';
two | f1
-----+--------
| -1234
| -32767
(2 rows)
SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 < int4 '0';
two | f1
-----+--------
| -1234
| -32767
(2 rows)
SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 <= int2 '0';
three | f1
-------+--------
| 0
| -1234
| -32767
(3 rows)
SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 <= int4 '0';
three | f1
-------+--------
| 0
| -1234
| -32767
(3 rows)
SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 > int2 '0';
two | f1
-----+-------
| 1234
| 32767
(2 rows)
SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 > int4 '0';
two | f1
-----+-------
| 1234
| 32767
(2 rows)
SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int2 '0';
three | f1
-------+-------
| 0
| 1234
| 32767
(3 rows)
SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int4 '0';
three | f1
-------+-------
| 0
| 1234
| 32767
(3 rows)
-- positive odds
SELECT '' AS one, i.* FROM INT2_TBL i WHERE (i.f1 % int2 '2') = int2 '1';
one | f1
-----+-------
| 32767
(1 row)
-- any evens
SELECT '' AS three, i.* FROM INT2_TBL i WHERE (i.f1 % int4 '2') = int2 '0';
three | f1
-------+-------
| 0
| 1234
| -1234
(3 rows)
SELECT '' AS five, i.f1, i.f1 * int2 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+-------
| 0 | 0
| 1234 | 2468
| -1234 | -2468
| 32767 | -2
| -32767 | 2
(5 rows)
SELECT '' AS five, i.f1, i.f1 * int4 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+--------
| 0 | 0
| 1234 | 2468
| -1234 | -2468
| 32767 | 65534
| -32767 | -65534
(5 rows)
SELECT '' AS five, i.f1, i.f1 + int2 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+--------
| 0 | 2
| 1234 | 1236
| -1234 | -1232
| 32767 | -32767
| -32767 | -32765
(5 rows)
SELECT '' AS five, i.f1, i.f1 + int4 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+--------
| 0 | 2
| 1234 | 1236
| -1234 | -1232
| 32767 | 32769
| -32767 | -32765
(5 rows)
SELECT '' AS five, i.f1, i.f1 - int2 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+-------
| 0 | -2
| 1234 | 1232
| -1234 | -1236
| 32767 | 32765
| -32767 | 32767
(5 rows)
SELECT '' AS five, i.f1, i.f1 - int4 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+--------
| 0 | -2
| 1234 | 1232
| -1234 | -1236
| 32767 | 32765
| -32767 | -32769
(5 rows)
SELECT '' AS five, i.f1, i.f1 / int2 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+--------
| 0 | 0
| 1234 | 617
| -1234 | -617
| 32767 | 16383
| -32767 | -16383
(5 rows)
SELECT '' AS five, i.f1, i.f1 / int4 '2' AS x FROM INT2_TBL i;
five | f1 | x
------+--------+--------
| 0 | 0
| 1234 | 617
| -1234 | -617
| 32767 | 16383
| -32767 | -16383
(5 rows)
src/test/regress/expected/int4-not-representable.out 0 → 100644
View file @ b86ca72f
--
-- INT4
-- WARNING: int4 operators never check for over/underflow!
-- Some of these answers are consequently numerically incorrect.
--
CREATE TABLE INT4_TBL(f1 int4);
INSERT INTO INT4_TBL(f1) VALUES ('0');
INSERT INTO INT4_TBL(f1) VALUES ('123456');
INSERT INTO INT4_TBL(f1) VALUES ('-123456');
INSERT INTO INT4_TBL(f1) VALUES ('34.5');
ERROR: pg_atoi: error in "34.5": can't parse ".5"
-- largest and smallest values
INSERT INTO INT4_TBL(f1) VALUES ('2147483647');
INSERT INTO INT4_TBL(f1) VALUES ('-2147483647');
-- bad input values -- should give warnings
INSERT INTO INT4_TBL(f1) VALUES ('1000000000000');
ERROR: pg_atoi: error reading "1000000000000": Math result not representable
INSERT INTO INT4_TBL(f1) VALUES ('asdf');
ERROR: pg_atoi: error in "asdf": can't parse "asdf"
SELECT '' AS five, INT4_TBL.*;
five | f1
------+-------------
| 0
| 123456
| -123456
| 2147483647
| -2147483647
(5 rows)
SELECT '' AS four, i.* FROM INT4_TBL i WHERE i.f1 <> int2 '0';
four | f1
------+-------------
| 123456
| -123456
| 2147483647
| -2147483647
(4 rows)
SELECT '' AS four, i.* FROM INT4_TBL i WHERE i.f1 <> int4 '0';
four | f1
------+-------------
| 123456
| -123456
| 2147483647
| -2147483647
(4 rows)
SELECT '' AS one, i.* FROM INT4_TBL i WHERE i.f1 = int2 '0';
one | f1
-----+----
| 0
(1 row)
SELECT '' AS one, i.* FROM INT4_TBL i WHERE i.f1 = int4 '0';
one | f1
-----+----
| 0
(1 row)
SELECT '' AS two, i.* FROM INT4_TBL i WHERE i.f1 < int2 '0';
two | f1
-----+-------------
| -123456
| -2147483647
(2 rows)
SELECT '' AS two, i.* FROM INT4_TBL i WHERE i.f1 < int4 '0';
two | f1
-----+-------------
| -123456
| -2147483647
(2 rows)
SELECT '' AS three, i.* FROM INT4_TBL i WHERE i.f1 <= int2 '0';
three | f1
-------+-------------
| 0
| -123456
| -2147483647
(3 rows)
SELECT '' AS three, i.* FROM INT4_TBL i WHERE i.f1 <= int4 '0';
three | f1
-------+-------------
| 0
| -123456
| -2147483647
(3 rows)
SELECT '' AS two, i.* FROM INT4_TBL i WHERE i.f1 > int2 '0';
two | f1
-----+------------
| 123456
| 2147483647
(2 rows)
SELECT '' AS two, i.* FROM INT4_TBL i WHERE i.f1 > int4 '0';
two | f1
-----+------------
| 123456
| 2147483647
(2 rows)
SELECT '' AS three, i.* FROM INT4_TBL i WHERE i.f1 >= int2 '0';
three | f1
-------+------------
| 0
| 123456
| 2147483647
(3 rows)
SELECT '' AS three, i.* FROM INT4_TBL i WHERE i.f1 >= int4 '0';
three | f1
-------+------------
| 0
| 123456
| 2147483647
(3 rows)
-- positive odds
SELECT '' AS one, i.* FROM INT4_TBL i WHERE (i.f1 % int2 '2') = int2 '1';
one | f1
-----+------------
| 2147483647
(1 row)
-- any evens
SELECT '' AS three, i.* FROM INT4_TBL i WHERE (i.f1 % int4 '2') = int2 '0';
three | f1
-------+---------
| 0
| 123456
| -123456
(3 rows)
SELECT '' AS five, i.f1, i.f1 * int2 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+---------
| 0 | 0
| 123456 | 246912
| -123456 | -246912
| 2147483647 | -2
| -2147483647 | 2
(5 rows)
SELECT '' AS five, i.f1, i.f1 * int4 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+---------
| 0 | 0
| 123456 | 246912
| -123456 | -246912
| 2147483647 | -2
| -2147483647 | 2
(5 rows)
SELECT '' AS five, i.f1, i.f1 + int2 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+-------------
| 0 | 2
| 123456 | 123458
| -123456 | -123454
| 2147483647 | -2147483647
| -2147483647 | -2147483645
(5 rows)
SELECT '' AS five, i.f1, i.f1 + int4 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+-------------
| 0 | 2
| 123456 | 123458
| -123456 | -123454
| 2147483647 | -2147483647
| -2147483647 | -2147483645
(5 rows)
SELECT '' AS five, i.f1, i.f1 - int2 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+------------
| 0 | -2
| 123456 | 123454
| -123456 | -123458
| 2147483647 | 2147483645
| -2147483647 | 2147483647
(5 rows)
SELECT '' AS five, i.f1, i.f1 - int4 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+------------
| 0 | -2
| 123456 | 123454
| -123456 | -123458
| 2147483647 | 2147483645
| -2147483647 | 2147483647
(5 rows)
SELECT '' AS five, i.f1, i.f1 / int2 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+-------------
| 0 | 0
| 123456 | 61728
| -123456 | -61728
| 2147483647 | 1073741823
| -2147483647 | -1073741823
(5 rows)
SELECT '' AS five, i.f1, i.f1 / int4 '2' AS x FROM INT4_TBL i;
five | f1 | x
------+-------------+-------------
| 0 | 0
| 123456 | 61728
| -123456 | -61728
| 2147483647 | 1073741823
| -2147483647 | -1073741823
(5 rows)
--
-- more complex expressions
--
-- variations on unary minus parsing
SELECT -2+3 AS one;
one
-----
1
(1 row)
SELECT 4-2 AS two;
two
-----
2
(1 row)
SELECT 2- -1 AS three;
three
-------
3
(1 row)
SELECT 2 - -2 AS four;
four
------
4
(1 row)
SELECT int2 '2' * int2 '2' = int2 '16' / int2 '4' AS true;
true
------
t
(1 row)
SELECT int4 '2' * int2 '2' = int2 '16' / int4 '4' AS true;
true
------
t
(1 row)
SELECT int2 '2' * int4 '2' = int4 '16' / int2 '4' AS true;
true
------
t
(1 row)
SELECT int4 '1000' < int4 '999' AS false;
false
-------
f
(1 row)
SELECT 4! AS twenty_four;
twenty_four
-------------
24
(1 row)
SELECT !!3 AS six;
six
-----
6
(1 row)
SELECT 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 AS ten;
ten
-----
10
(1 row)
SELECT 2 + 2 / 2 AS three;
three
-------
3
(1 row)
SELECT (2 + 2) / 2 AS two;
two
-----
2
(1 row)
SELECT dsqrt(float8 '64') AS eight;
eight
-------
8
(1 row)
SELECT |/float8 '64' AS eight;
eight
-------
8
(1 row)
SELECT ||/float8 '27' AS three;
three
-------
3
(1 row)
src/test/regress/regress.sh
View file @ b86ca72f
#!/bin/sh
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.38 2000/01/09 07:53:58 tgl Exp $
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.39 2000/01/09 20:54:36 tgl Exp $
#
if [ $# -eq 0 ]
then
......@@ -27,16 +27,34 @@ else
ECHO_C='\c'
fi
if [ -d ./obj ]; then
cd ./obj
fi
PGTZ="PST8PDT"; export PGTZ
PGDATESTYLE="Postgres,US"; export PGDATESTYLE
#FRONTEND=monitor
FRONTEND="psql $HOSTLOC -n -e -q"
# ----------
# Scan resultmap file to find which platform-specific expected files to use.
# The format of each line of the file is
# testname/hostnamepattern=substitutefile
# where the hostnamepattern is evaluated per the rules of expr(1) --- namely,
# it is a standard regular expression with an implicit ^ at the start.
# ----------
SUBSTLIST=""
exec 4<resultmap
while read LINE <&4
do
HOSTPAT=`expr "$LINE" : '.*/\(.*\)='`
if [ `expr "$hostname" : "$HOSTPAT"` -ne 0 ]
then
SUBSTLIST="$SUBSTLIST $LINE"
fi
done
exec 4<&-
if [ -d ./obj ]; then
cd ./obj
fi
echo "=============== Notes... ================="
echo "postmaster must already be running for the regression tests to succeed."
echo "Please report any apparent problems to ports@postgresql.org"
......@@ -94,32 +112,19 @@ do
$FRONTEND regression < sql/${tst}.sql > results/${tst}.out 2>&1
#
# Check resultmap to see if we should compare to a
# system-specific result file. The format of the .similar file is
# testname/hostname=substitutefile
# Check list extracted from resultmap to see if we should compare
# to a system-specific expected file.
# There shouldn't be multiple matches, but take the last if there are.
#
EXPECTED="expected/${tst}.out"
SUBST=`grep "^$tst/$hostname=" resultmap | sed 's/^.*=//' | tail -1`
if test "$SUBST"
then EXPECTED="expected/${SUBST}.out"
else
# Next look for a .similar entry that is a prefix of $hostname.
# If there are multiple matches, take the last one.
exec 4<resultmap
while read LINE <&4
do
SIMHOST=`expr "$LINE" : '\(.*\)='`
MATCH=`expr "$tst/$hostname" : "$SIMHOST"`
if test "$MATCH" != 0
then SUBST=`echo "$LINE" | sed 's/^.*=//'`
for LINE in $SUBSTLIST
do
if [ `expr "$LINE" : "$tst/"` -ne 0 ]
then
SUBST=`echo "$LINE" | sed 's/^.*=//'`
EXPECTED="expected/${SUBST}.out"
fi
done
exec 4<&-
if test "$SUBST"
then EXPECTED="expected/${SUBST}.out"
fi
fi
done
if [ `diff ${DIFFOPT} ${EXPECTED} results/${tst}.out | wc -l` -ne 0 ]
then
......
src/test/regress/resultmap
View file @ b86ca72f
int2/hppa=int2-too-large
int4/hppa=int4-too-large
geometry/hppa2.0=geometry-hppa2.0
int2/i.86-pc-linux-gnulibc=int2-not-representable
int4/i.86-pc-linux-gnulibc=int4-not-representable
geometry/hppa1\.1=geometry-hppa1.1
geometry/hppa2\.0=geometry-hppa2.0
geometry/i.86-.*-gnulibc=geometry-i86-gnulibc
horology/hppa=horology-no-DST-before-1970
src/test/regress/run_check.sh
View file @ b86ca72f
#!/bin/sh
#
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.5 2000/01/09 07:53:58 tgl Exp $
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.6 2000/01/09 20:54:36 tgl Exp $
# ----------
# Check call syntax
......@@ -79,16 +79,23 @@ PGDATESTYLE="Postgres,US"; export PGDATESTYLE
FRONTEND="$BINDIR/psql $HOSTLOC -n -e -q"
# ----------
# Prepare temp file holding combined test script.
# Scan resultmap file to find which platform-specific expected files to use.
# The format of each line of the file is
# testname/hostnamepattern=substitutefile
# where the hostnamepattern is evaluated per the rules of expr(1) --- namely,
# it is a standard regular expression with an implicit ^ at the start.
# ----------
TESTLIST="/tmp/testlist.$$"
TESTS=./sql/run_check.tests
(
cat $TESTS
for name in $extratests ; do
echo "test $name"
done
) > $TESTLIST
SUBSTLIST=""
exec 4<resultmap
while read LINE <&4
do
HOSTPAT=`expr "$LINE" : '.*/\(.*\)='`
if [ `expr "$hostname" : "$HOSTPAT"` -ne 0 ]
then
SUBSTLIST="$SUBSTLIST $LINE"
fi
done
exec 4<&-
# ----------
# Catch SIGINT and SIGTERM to shutdown the postmaster
......@@ -104,7 +111,6 @@ trap ' echo ""
echo ""
fi
echo ""
rm $TESTLIST
exit 1
' 2 15
......@@ -221,15 +227,21 @@ fi
# ----------
# Run the regression tests specified in the $TESTLIST file
# Run the regression tests specified in the ./sql/run_check.tests file
# ----------
echo "=============== Running regression queries... ================"
echo "" > regression.diffs
echo "" > regress.out
TESTS=./sql/run_check.tests
lno=0
while read line
do
(
cat $TESTS
for name in $extratests ; do
echo "test $name"
done
) | while read line ; do
# ----------
# Count line numbers and skip comments and empty lines
# ----------
......@@ -256,8 +268,7 @@ do
pargroup=$name
parntests=0
parpar=0
while read line
do
while read line ; do
# ----------
# Again count line numbers and skip comments
# ----------
......@@ -334,14 +345,14 @@ do
> results/${name}.out 2>&1
$ECHO_N " $name" $ECHO_C
) &
done </dev/null
done
wait
echo ""
# ----------
# Setup status information for the diff check below
# ----------
checklist=$parlist
checklist="$parlist"
checkpname=1
;;
......@@ -357,7 +368,7 @@ do
# ----------
# Setup status information for the diff check below
# ----------
checklist=$name
checklist="$name"
checkpname=0
;;
......@@ -379,55 +390,43 @@ do
# old format, so checkresults will still find the proper
# information.
# ----------
for tst in $checklist ; do
for name in $checklist ; do
if [ $checkpname -ne 0 ]
then
pnam=`echo $tst | awk '{printf "%-20.20s", $1;}'`
pnam=`echo $name | awk '{printf "%-20.20s", $1;}'`
$ECHO_N " test $pnam ... " $ECHO_C
fi
#
# Check resultmap to see if we should compare to a
# system-specific result file. The format of the file is
# testname/hostname=substitutefile
# Check list extracted from resultmap to see if we should compare
# to a system-specific expected file.
# There shouldn't be multiple matches, but take the last if there are.
#
EXPECTED="expected/${tst}.out"
SUBST=`grep "^$tst/$hostname=" resultmap | sed 's/^.*=//' | tail -1`
if test "$SUBST"
then EXPECTED="expected/${SUBST}.out"
else
# Next look for a .similar entry that is a prefix of $hostname.
# If there are multiple matches, take the last one.
while read LINE
do
SIMHOST=`expr "$LINE" : '\(.*\)='`
MATCH=`expr "$tst/$hostname" : "$SIMHOST"`
echo "$LINE $SIMHOST $MATCH"
if test "$MATCH" != 0
then SUBST=`echo "$LINE" | sed 's/^.*=//'`
EXPECTED="expected/${name}.out"
for LINE in $SUBSTLIST
do
if [ `expr "$LINE" : "$name/"` -ne 0 ]
then
SUBST=`echo "$LINE" | sed 's/^.*=//'`
EXPECTED="expected/${SUBST}.out"
fi
done <resultmap
if test "$SUBST"
then EXPECTED="expected/${SUBST}.out"
fi
fi
done
if [ `diff -w ${EXPECTED} results/${tst}.out | wc -l` -ne 0 ]
if [ `diff -w ${EXPECTED} results/${name}.out | wc -l` -ne 0 ]
then
( diff -wC3 ${EXPECTED} results/${tst}.out ; \
( diff -wC3 ${EXPECTED} results/${name}.out ; \
echo "" ; \
echo "----------------------" ; \
echo "" ; \
) >> regression.diffs
echo "FAILED"
echo "$tst .. failed" >> regress.out
echo "$name .. failed" >> regress.out
else
echo "ok"
echo "$tst .. ok" >> regress.out
echo "$name .. ok" >> regress.out
fi
done
done <$TESTLIST | tee run_check.out 2>&1
done | tee run_check.out 2>&1
# ----------
# Finally kill the postmaster we started
......@@ -435,6 +434,5 @@ done <$TESTLIST | tee run_check.out 2>&1
echo "=============== Terminating regression postmaster ================"
kill -15 $PMPID
rm $TESTLIST
exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment