From owner-svn-src-user@FreeBSD.ORG  Sat Oct  5 19:29:49 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 584A148F;
 Sat,  5 Oct 2013 19:29:49 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 42EC22198;
 Sat,  5 Oct 2013 19:29:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r95JTncP091576;
 Sat, 5 Oct 2013 19:29:49 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r95JTnmE091575;
 Sat, 5 Oct 2013 19:29:49 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201310051929.r95JTnmE091575@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sat, 5 Oct 2013 19:29:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256070 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Oct 2013 19:29:49 -0000

Author: des
Date: Sat Oct  5 19:29:48 2013
New Revision: 256070
URL: http://svnweb.freebsd.org/changeset/base/256070

Log:
  Hack the WORD_OPTIONS validation so strings like i386/pc98 are seen as
  valid words.

Modified:
  user/des/tinderbox/tbmaster.pl

Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl	Sat Oct  5 19:17:56 2013	(r256069)
+++ user/des/tinderbox/tbmaster.pl	Sat Oct  5 19:29:48 2013	(r256070)
@@ -158,7 +158,9 @@ sub expand($) {
 	} @expanded;
     } elsif ($WORD_OPTIONS{uc($key)}) {
 	@expanded = map {
-	    m/^([\w.-]+|)$/
+	    # hack - support not only "word" but also "word/word" so
+	    # platform designations will pass the test.
+	    m@^([\w.-]+(?:/[\w.-]+)?|)$@
 		or die("invalid value for word variable $key: $_\n");
 	    $1
 	} @expanded;