Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 362a0f6

Browse files
committed
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
1 parent a8020a7 commit 362a0f6

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

doc/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.14 1999/12/05 21:23:00 momjian Exp $
11+
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.15 2000/05/17 16:57:40 momjian Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

@@ -42,7 +42,7 @@ TARGETS= $(MODULES:%=%.html)
4242
.PHONY: beforeinstall install all clean distclean
4343

4444
beforeinstall::
45-
if [ ! -d $(PGDOCS) ]; then mkdir $(PGDOCS); fi
45+
-@if [ ! -d $(PGDOCS) ]; then mkdir $(PGDOCS); fi
4646

4747
install::
4848
$(MAKE) all
@@ -57,7 +57,7 @@ distclean::
5757
$(MAKE) clean
5858

5959
man::
60-
if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
60+
-@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
6161
$(GZCAT) man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
6262

6363
#

src/test/regress/run_check.sh

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.14 2000/05/16 02:14:15 tgl Exp $
3+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.15 2000/05/17 16:57:41 momjian Exp $
44

55
# ----------
66
# Check call syntax
@@ -192,7 +192,7 @@ fi
192192
# him some time to pass the WAL recovery code.
193193
#----------
194194
echo "=============== Starting regression postmaster ================"
195-
postmaster -D $PGDATA -p $PGPORT $PMOPTIONS >$LOGDIR/postmaster.log 2>&1 &
195+
postmaster -D $PGDATA -i -p $PGPORT $PMOPTIONS >$LOGDIR/postmaster.log 2>&1 &
196196
PMPID=$!
197197
sleep 2
198198

@@ -239,13 +239,15 @@ fi
239239
# ----------
240240
# Install the PL/pgSQL language in it
241241
# ----------
242+
if [ "x$hostname" != "xi386-pc-qnx" ]; then
242243
echo "=============== Installing PL/pgSQL... ================"
243244
createlang -L $LIBDIR $HOSTLOC plpgsql regression
244245
if [ $? -ne 0 -a $? -ne 2 ]; then
245246
echo createlang failed
246247
kill -15 $PMPID
247248
exit 1
248249
fi
250+
fi
249251

250252

251253
# ----------
@@ -255,6 +257,12 @@ echo "=============== Running regression queries... ================"
255257
echo "" > regression.diffs
256258
echo "" > regress.out
257259

260+
if [ "x$hostname" = "xi386-pc-qnx" ]; then
261+
DIFFOPT="-b"
262+
else
263+
DIFFOPT="-w"
264+
fi
265+
258266
TESTS=./sql/run_check.tests
259267
lno=0
260268
(
@@ -434,9 +442,9 @@ lno=0
434442
fi
435443
done
436444

437-
if [ `diff -w ${EXPECTED} results/${name}.out | wc -l` -ne 0 ]
445+
if [ `diff ${DIFFOPT} ${EXPECTED} results/${name}.out | wc -l` -ne 0 ]
438446
then
439-
( diff -wC3 ${EXPECTED} results/${name}.out ; \
447+
( diff ${DIFFOPT} -C3 ${EXPECTED} results/${name}.out ; \
440448
echo "" ; \
441449
echo "----------------------" ; \
442450
echo "" ; \

0 commit comments

Comments
 (0)