* Makefile (check): Run config-guess.sh tests as well.

* testsuite/config-guess.sh: New test.
	* testsuite/config-guess.data: New file.
	* testsuite/uname.in: Likewise.
	* testsuite/config-sub.data (amd64-unknown-freebsd5.2): New case.

ChangeLog

@@ -1,3 +1,11 @@
+2004-08-22  Ben Elliston  <bje@gnu.org>
+
+	* Makefile (check): Run config-guess.sh tests as well.
+	* testsuite/config-guess.sh: New test.
+	* testsuite/config-guess.data: New file.
+	* testsuite/uname.in: Likewise.
+	* testsuite/config-sub.data (amd64-unknown-freebsd5.2): New case.
+
 2004-08-13  Brad Smith  <brad@comstyle.com>
 
 	* config.guess (*:OpenBSD:*:*): Remove defunct MIPS machines.

Makefile

@@ -13,4 +13,4 @@ upload:
 	rm config.{guess,sub}{.sig,.directive.asc}
 
 check:
-	cd testsuite && sh config-sub.sh
+	cd testsuite && (sh config-sub.sh; sh config-guess.sh) && rm uname

testsuite/config-guess.data

@@ -0,0 +1 @@
+i386	1.6	NetBSD	GENERIC	i386-unknown-netbsdelf1.6

testsuite/config-guess.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# Copyright 2004 Free Software Foundation, Inc.
+# Contributed by Ben Elliston <bje@gnu.org>.
+#
+# This test reads 5-tuples from config-guess.data: the components of the simulated
+# uname(1) output and the expected GNU system triplet.
+
+verbose=false
+rc=0
+export PATH=`pwd`:$PATH
+IFS="	" # tab
+
+while read machine release system version triplet ; do
+  sed \
+    -e "s/@MACHINE@/$machine/" \
+    -e "s/@RELEASE@/$release/" \
+    -e "s/@SYSTEM@/$system/" \
+    -e "s/@VERSION@/$version/" < uname.in > uname
+  chmod +x uname
+  output=`sh ../config.guess 2>/dev/null`
+  if test $? != 0 ; then
+    echo "FAIL: unable to guess $machine:$release:$system:$version"
+    rc=1
+    continue
+  fi
+  if test $output != $triplet ; then
+    echo "FAIL: $output (expected $triplet)"
+    rc=1
+    continue
+  fi
+  $verbose && echo "PASS: $triplet"
+done < config-guess.data 
+
+if test $rc -eq 0 ; then
+  $verbose || echo "PASS: config.guess checks"
+else
+  test $rc -eq 1 && echo "Unexpected failures."
+fi
+
+exit $rc

testsuite/config-sub.data

@@ -1,18 +1,19 @@
-arm-coff		arm-unknown-coff
+arm-coff			arm-unknown-coff
-arm-elf			arm-unknown-elf
+arm-elf				arm-unknown-elf
-sun3			m68k-sun-sunos4.1.1
+sun3				m68k-sun-sunos4.1.1
-sun4 			sparc-sun-sunos4.1.1
+sun4 				sparc-sun-sunos4.1.1
-ibm			i370-ibm-aix
+ibm				i370-ibm-aix
-i386-os2		i386-pc-os2
+i386-os2			i386-pc-os2
-os400			powerpc-ibm-os400
+os400				powerpc-ibm-os400
-mmix			mmix-knuth-mmixware
+mmix				mmix-knuth-mmixware
-mmix-elf		mmix-knuth-elf
+mmix-elf			mmix-knuth-elf
-i386-linux		i386-pc-linux-gnu
+i386-linux			i386-pc-linux-gnu
-i386-netbsd		i386-pc-netbsd
+i386-netbsd			i386-pc-netbsd
-i386-openbsd		i386-pc-openbsd
+i386-openbsd			i386-pc-openbsd
-i386-freebsd		i386-pc-freebsd
+i386-freebsd			i386-pc-freebsd
-i386-elf		i386-pc-elf
+i386-elf			i386-pc-elf
-i486-elf		i486-pc-elf
+i486-elf			i486-pc-elf
-i586-elf		i586-pc-elf
+i586-elf			i586-pc-elf
-i686-elf		i686-pc-elf
+i686-elf			i686-pc-elf
-i786-elf		i786-pc-elf
+i786-elf			i786-pc-elf
+amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2

testsuite/uname.in

@@ -0,0 +1,9 @@
+#!/bin/sh
+# uname(1) simulator, inspired by Pavel Roskin.
+
+[ $# -ne 1 ] && exec sh $0 -s
+[ $1 = -m ] && echo "@MACHINE@" && exit 0
+[ $1 = -r ] && echo "@RELEASE@" && exit 0
+[ $1 = -s ] && echo "@SYSTEM@" && exit 0
+[ $1 = -v ] && echo "@VERSION@" && exit 0
+[ $1 = -p ] && echo "Pentium III(TM)-ISA/PCI"