The check of class string in configure (line 1732) fails because this class

is in <string> and not in <string.h> on QNX4/egcs-2.91.60.
Probably this can be changed for all platforms. The test in line 1705 uses
<string> as well. Because I am not sure, I havn't this included into the
patch.

doc/Makefile has to be sligthly  modified as it has been done for
src/backend/Makefile due to a QNX4 problem (patch attached)

Furthermore src/test/regress/run_check.sh needs to be patched as it has been
done for regress.sh (patch attached). Please note that in the patch the
postmaster is started always with the -i option.

run_check.sh reports the test "limit" as failed, but in reallity it is OK.
regress.sh reports it as OK.

Andreas Kardos
This commit is contained in:
Bruce Momjian 2000-05-17 16:57:41 +00:00
parent a8020a78ec
commit 362a0f68d9
2 changed files with 15 additions and 7 deletions

View File

@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.14 1999/12/05 21:23:00 momjian Exp $
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.15 2000/05/17 16:57:40 momjian Exp $
#
#----------------------------------------------------------------------------
@ -42,7 +42,7 @@ TARGETS= $(MODULES:%=%.html)
.PHONY: beforeinstall install all clean distclean
beforeinstall::
if [ ! -d $(PGDOCS) ]; then mkdir $(PGDOCS); fi
-@if [ ! -d $(PGDOCS) ]; then mkdir $(PGDOCS); fi
install::
$(MAKE) all
@ -57,7 +57,7 @@ distclean::
$(MAKE) clean
man::
if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
-@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
$(GZCAT) man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
#

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.14 2000/05/16 02:14:15 tgl Exp $
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.15 2000/05/17 16:57:41 momjian Exp $
# ----------
# Check call syntax
@ -192,7 +192,7 @@ fi
# him some time to pass the WAL recovery code.
#----------
echo "=============== Starting regression postmaster ================"
postmaster -D $PGDATA -p $PGPORT $PMOPTIONS >$LOGDIR/postmaster.log 2>&1 &
postmaster -D $PGDATA -i -p $PGPORT $PMOPTIONS >$LOGDIR/postmaster.log 2>&1 &
PMPID=$!
sleep 2
@ -239,6 +239,7 @@ fi
# ----------
# Install the PL/pgSQL language in it
# ----------
if [ "x$hostname" != "xi386-pc-qnx" ]; then
echo "=============== Installing PL/pgSQL... ================"
createlang -L $LIBDIR $HOSTLOC plpgsql regression
if [ $? -ne 0 -a $? -ne 2 ]; then
@ -246,6 +247,7 @@ if [ $? -ne 0 -a $? -ne 2 ]; then
kill -15 $PMPID
exit 1
fi
fi
# ----------
@ -255,6 +257,12 @@ echo "=============== Running regression queries... ================"
echo "" > regression.diffs
echo "" > regress.out
if [ "x$hostname" = "xi386-pc-qnx" ]; then
DIFFOPT="-b"
else
DIFFOPT="-w"
fi
TESTS=./sql/run_check.tests
lno=0
(
@ -434,9 +442,9 @@ lno=0
fi
done
if [ `diff -w ${EXPECTED} results/${name}.out | wc -l` -ne 0 ]
if [ `diff ${DIFFOPT} ${EXPECTED} results/${name}.out | wc -l` -ne 0 ]
then
( diff -wC3 ${EXPECTED} results/${name}.out ; \
( diff ${DIFFOPT} -C3 ${EXPECTED} results/${name}.out ; \
echo "" ; \
echo "----------------------" ; \
echo "" ; \