diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 77432c5ed..4862a0045 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -171,10 +171,10 @@ sub one_test { $UnsupCnt++; } else { $test->oprint("FAILED: ","*"x60,"\n"); - push @fails, "\t#".$test->soprint("%Error: $test->{errors}\n"); my $j = ($opt_jobs>1?" -j":""); - push @fails, "\t\tmake$j && test_regress/" - .$test->{pl_filename}." ".join(' ',@Orig_ARGV_Sw)."\n"; + push @fails, ("\t#".$test->soprint("%Error: $test->{errors}\n") + ."\t\tmake$j && test_regress/" + .$test->{pl_filename}." ".join(' ',@Orig_ARGV_Sw)."\n"); $FailCnt++; report(\@fails, $Log_Filename); my $other = ""; @@ -256,7 +256,7 @@ sub report { $fh->print("="x70,"\n"); $fh->printf("TESTS Passed $OkCnt Unsup $UnsupCnt Skipped $SkipCnt Failed $FailCnt Time %d:%02d\n", int($delta/60),$delta%60); - foreach my $f (@$fails) { + foreach my $f (sort @$fails) { chomp $f; $fh->print("$f\n"); } diff --git a/test_regress/t/t_var_bad_sameas.pl b/test_regress/t/t_var_bad_sameas.pl index d73f00efd..bc2f9d763 100755 --- a/test_regress/t/t_var_bad_sameas.pl +++ b/test_regress/t/t_var_bad_sameas.pl @@ -12,7 +12,7 @@ compile ( expect=> '%Error: t/t_var_bad_sameas.v:\d+: Unsupported in C: Cell has the same name as variable: varfirst %Error: t/t_var_bad_sameas.v:\d+: ... Location of original declaration -%Error: t/t_var_bad_sameas.v:\d+: Unsupported in C: Task has the same name as variable: varfirst +%Error: t/t_var_bad_sameas.v:\d+: Unsupported in C: Task has the same name as (variable|cell): varfirst %Error: t/t_var_bad_sameas.v:\d+: ... Location of original declaration %Error: t/t_var_bad_sameas.v:\d+: Unsupported in C: Variable has same name as cell: cellfirst %Error: t/t_var_bad_sameas.v:\d+: Unsupported in C: Task has the same name as cell: cellfirst