From owner-p4-projects@FreeBSD.ORG  Sun Mar 28 10:04:51 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C9B01065670; Sun, 28 Mar 2010 10:04:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E54EC106566B
	for <perforce@FreeBSD.org>; Sun, 28 Mar 2010 10:04:50 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D2B5A8FC0C
	for <perforce@FreeBSD.org>; Sun, 28 Mar 2010 10:04:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2SA4ojL032617
	for <perforce@FreeBSD.org>; Sun, 28 Mar 2010 10:04:50 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2SA4olB032615
	for perforce@freebsd.org; Sun, 28 Mar 2010 10:04:50 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sun, 28 Mar 2010 10:04:50 GMT
Message-Id: <201003281004.o2SA4olB032615@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176194 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Mar 2010 10:04:51 -0000

http://p4web.freebsd.org/chv.cgi?CH=176194

Change 176194 by gcooper@gcooper-bayonetta on 2010/03/28 10:04:05

	- Simplify test script. Add another negative testcase for an invalid version string.
	- Fix compile error with version/perform.c

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/version/test_index_search.sh#2 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#4 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/version/test_index_search.sh#2 (text+ko) ====

@@ -3,7 +3,12 @@
 # A simple script for testing -I (INDEX lookup).
 #
 
+set -e
+
 # XXX (gcooper): hardcoding version in test is BAD!
-UNAME_r=8.0-RELEASE pkg_version -I >/dev/null || exit $?
+UNAME_r=8.0-RELEASE pkg_version -I >/dev/null
 export UNAME_r=1142.0-RELEASE
 pkg_version -I 2>&1 | grep -Eq "pkg_version: Unable to open.*INDEX-${UNAME_r%.*}"
+# Battle of Britain: TAKA TAKA TAKA TAKA TAKA TAKA!
+export UNAME_r=Iveseenmonkiescodebetterthanthis
+pkg_version -I 2>&1 | grep -Eq "bad release version specified: $UNAME_r"

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#4 (text+ko) ====

@@ -60,7 +60,8 @@
 	    __func__);
 	return 1;
     } else if ((rel_major_ver = (int) strtol(u.release, NULL, 10)) <= 0) {
-	warnx("%s.%s: release version specified: %s", u.release);
+	warnx("%s.%s: bad release version specified: %s", progname, __func__,
+	    u.release);
 	return 1;
     }