From c1bfc9d7fa10648ff8ad72a37bc8958075496270 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 31 Mar 2000 22:03:52 +0000
Subject: [PATCH] Adjusted for new (again!) config.guess output under QNX
---
src/configure.in | 2 +-
src/test/regress/regress.sh | 8 ++++----
src/test/regress/resultmap | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/configure.in b/src/configure.in
index f5baf223000..45632f9455a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -43,7 +43,7 @@ nextstep*) os=nextstep need_tas=no ;;
sysv4*) os=svr4 need_tas=no ;;
sysv5uw*) os=unixware need_tas=no ;;
unixware*) os=unixware need_tas=no ;;
- qnx4*) os=qnx4 need_tas=no ;;
+ qnx*) os=qnx4 need_tas=no ;;
*) echo ""
echo "*************************************************************"
echo "configure does not currently recognize your operating system,"
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index 33812b076ca..fc4163435b0 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.47 2000/03/31 14:14:34 momjian Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.48 2000/03/31 22:03:52 petere Exp $
#
if [ $# -eq 0 ]; then
echo "Syntax: $0 <hostname> [extra-tests]"
@@ -11,7 +11,7 @@ shift
extratests="$*"
case $hostname in
- i*86-pc-cygwin* | i386-qnx-qnx4)
+ i*86-pc-cygwin* | i386-*-qnx*)
HOSTLOC="-h localhost"
;;
*)
@@ -82,7 +82,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
-if [ "x$hostname" != "xi386-qnx-qnx4" ]; then
+if [ "x$hostname" != "xi386-pc-qnx" ]; then
echo "=============== installing languages... ================="
$ECHO_N "installing PL/pgSQL .. " $ECHO_C
createlang $HOSTLOC plpgsql regression
@@ -97,7 +97,7 @@ fi
echo "=============== running regression queries... ================="
echo "" > regression.diffs
-if [ "x$hostname" = "xi386-qnx-qnx4" ]; then
+if [ "x$hostname" = "xi386-pc-qnx" ]; then
DIFFOPT="-b"
else
DIFFOPT="-w"
diff --git a/src/test/regress/resultmap b/src/test/regress/resultmap
index fb898f0b06d..435ddcf9d64 100644
--- a/src/test/regress/resultmap
+++ b/src/test/regress/resultmap
@@ -1,8 +1,8 @@
abstime/alpha.*-dec-osf=abstime-solaris-1947
abstime/sparc-sun-solaris=abstime-solaris-1947
-float4/.*-qnx4=float4-exp-three-digits
+float4/.*-qnx=float4-exp-three-digits
float8/.*-netbsd=float8-small-is-zero
-float8/.*-qnx4=float8-exp-three-digits
+float8/.*-qnx=float8-exp-three-digits
float8/alpha.*-dec-osf=float8-fp-exception
float8/i.86-pc-cygwin*=float8-cygwin
geometry/.*-freebsd=geometry-positive-zeros
@@ -18,7 +18,7 @@ horology/sparc-sun-solaris=horology-solaris-1947
int2/.*-aix4=int2-too-large
int2/.*-freebsd=int2-too-large
int2/.*-netbsd=int2-too-large
-int2/.*-qnx4=int2-too-large
+int2/.*-qnx=int2-too-large
int2/alpha.*-dec-osf=int2-too-large
int2/hppa=int2-too-large
int2/i.86-pc-cygwin*=int2-math-result-out-of-range
@@ -28,13 +28,13 @@ int2/sparc-sun-solaris=int2-too-large
int4/.*-aix4=int4-too-large
int4/.*-freebsd=int4-too-large
int4/.*-netbsd=int4-too-large
-int4/.*-qnx4=int4-too-large
+int4/.*-qnx=int4-too-large
int4/alpha.*-dec-osf=int4-too-large
int4/hppa=int4-too-large
int4/i.86-pc-cygwin*=int4-math-result-out-of-range
int4/i.86-pc-linux-gnulibc=int4-not-representable
int4/powerpc-unknown-linux-gnulibc1=int4-not-representable
int4/sparc-sun-solaris=int4-too-large
-int8/.*-qnx4=int8-exp-three-digits
+int8/.*-qnx=int8-exp-three-digits
tinterval/alpha.*-dec-osf=tinterval-solaris-1947
tinterval/sparc-sun-solaris=tinterval-solaris-1947
--
GitLab