Merge pull request #3889 from forejtv/forejtv/test-pl-var-separator

forejtv · web-flow · commit be2c06833648 · 2019-01-22T18:14:01.000Z
Variable in test.desc file can be also separated by ':' or ';'
diff --git a/regression/test.pl b/regression/test.pl
@@ -74,6 +74,7 @@ ($$$$$$$$$$)
   foreach my $key (@keys) {
     my $value = $defines->{$key};
     $options =~ s/(\$$key$|\$$key )/$value /g;
+    $options =~ s/\$$key([:;])/$value\1/g; # Variables in --classpath are separated by (semi)colons
   }
   if (scalar @keys) {
     foreach my $word (split(/\s/, $options)) {

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ ($$$$$$$$$$)`
`74`	`74`	`foreach my $key (@keys) {`
`75`	`75`	`my $value = $defines->{$key};`
`76`	`76`	`$options =~ s/(\$$key$\|\$$key )/$value /g;`
	`77`	`+ $options =~ s/\$$key([:;])/$value\1/g; # Variables in --classpath are separated by (semi)colons`
`77`	`78`	`}`
`78`	`79`	`if (scalar @keys) {`
`79`	`80`	`foreach my $word (split(/\s/, $options)) {`