svn commit: r256070 - user/des/tinderbox

[Dag-Erling Smørgrav]

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;