Add support for the += operator, which appends to a multiple-value variable.

2 files changed, 19 insertions, 6 deletions

diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index b9b256f..5d5f07d 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -84,8 +84,9 @@ used to specify default values shared by multiple configurations.
 The configuration consists of a list of single- or multiple-value
 variable assignments:
 .Bl -tag
-.It Va variable = Ar value
-.It Va variable = Ar value1 , Ar value2, ...
+.It Va single_variable = Ar value
+.It Va multi_variable = Ar value1 , Ar value2, ...
+.It Va multi_variable += Ar value3 , ...
 .El
 .Pp
 Whitespace around the equal sign and around the commas separating
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 71751a1..cfe8429 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -143,8 +143,8 @@ sub readconf($) {
 	$line .= $_;
 	if (length($line) && $line !~ s/\\$/ /) {
 	    die("$fn: syntax error on line $n\n")
-		unless ($line =~ m/^(\w+)\s*=\s*(.*)$/);
-	    my ($key, $val) = (uc($1), $2);
+		unless ($line =~ m/^(\w+)\s*([+]?=)\s*(.*)$/);
+	    my ($key, $op, $val) = (uc($1), $2, $3);
 	    $val = ''
 		unless defined($val);
 	    die("$fn: unknown keyword on line $n\n")
@@ -154,10 +154,22 @@ sub readconf($) {
 		foreach (@a) {
 		    s/^\'([^\']*)\'$/$1/;
 		}
-		$CONFIG{$key} = \@a;
+		if ($op eq '=') {
+		    $CONFIG{$key} = \@a;
+		} elsif ($op eq '+=') {
+		    push(@{$CONFIG{$key}}, @a);
+		} else {
+		    die("can't happen\n");
+		}
 	    } else {
 		$val =~ s/^\'([^\']*)\'$/$1/;
-		$CONFIG{$key} = $val;
+		if ($op eq '=') {
+		    $CONFIG{$key} = $val;
+		} elsif ($op eq '+=') {
+		    die("$fn: invalid operator on line $n\n");
+		} else {
+		    die("can't happen\n");
+		}
 	    }
 	    $line = "";
 	}