From de1bb5aeb693e1b4c7306c22eb3c8d0d1e8b97ae Mon Sep 17 00:00:00 2001
From: Jeremy Bennett <jeremy.bennett@embecosm.com>
Date: Tue, 24 Jul 2012 18:48:51 -0400
Subject: [PATCH] Tests: fix driver.pl not tracing time 0, bug536.

Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
---
 test_regress/driver.pl               |  5 ++++-
 test_regress/t/t_var_escape.out      | 14 ++++++++++++--
 test_regress/t/t_var_nonamebegin.out | 18 ++++++++++++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index 57c0cb81c..77d426f4e 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -1011,6 +1011,9 @@ sub _make_main {
 	}
 	$fh->print("    topp->trace (tfp, 99);\n");
 	$fh->print("    tfp->open (\"$self->{obj_dir}/simx.vcd\");\n");
+	if ($self->{trace} && !$self->sc_or_sp) {
+	    $fh->print("	if (tfp) tfp->dump (main_time);\n");
+	}
 	$fh->print("#endif\n");
     }
 
@@ -1075,7 +1078,7 @@ sub _print_advance_time {
     } else {
 	if ($action) {
 	    print $fh "	${set}eval();\n";
-	    if ($self->{trace} && !$self->{sp}) {
+	    if ($self->{trace} && !$self->sc_or_sp) {
 		$fh->print("#if VM_TRACE\n");
 		$fh->print("	if (tfp) tfp->dump (main_time);\n");
 		$fh->print("#endif //VM_TRACE\n");
diff --git a/test_regress/t/t_var_escape.out b/test_regress/t/t_var_escape.out
index 62d12fa80..44f578b16 100644
--- a/test_regress/t/t_var_escape.out
+++ b/test_regress/t/t_var_escape.out
@@ -1,5 +1,5 @@
-$version Generated by SpTraceVcd $end
-$date Fri Nov 13 19:14:12 2009
+$version Generated by VerilatedVcd $end
+$date Tue Jul 24 18:44:43 2012
  $end
 $timescale 1ns $end
 
@@ -33,6 +33,16 @@ $timescale 1ns $end
 $enddefinitions $end
 
 
+#0
+1$
+0%
+b11111111111111111111111111111110 &
+b00000000000000000000000000000001 #
+0'
+1(
+1)
+1*
+1+
 #10
 0$
 1%
diff --git a/test_regress/t/t_var_nonamebegin.out b/test_regress/t/t_var_nonamebegin.out
index 179a00a3b..1fecfae58 100644
--- a/test_regress/t/t_var_nonamebegin.out
+++ b/test_regress/t/t_var_nonamebegin.out
@@ -1,5 +1,5 @@
-$version Generated by SpTraceVcd $end
-$date Sun Oct 11 20:21:49 2009
+$version Generated by VerilatedVcd $end
+$date Tue Jul 24 18:46:01 2012
  $end
 $timescale 1ns $end
 
@@ -35,3 +35,17 @@ $timescale 1ns $end
   $upscope $end
  $upscope $end
 $enddefinitions $end
+
+
+#0
+0#
+0$
+0%
+b00000000000000000000000000000000 &
+b00000000000000000000000000000000 '
+b00000000000000000000000000000000 (
+b00000000000000000000000000000000 )
+b00000000000000000000000000000000 *
+b00000000000000000000000000000000 +
+b00000000000000000000000000000000 ,
+b00000000000000000000000000000000 -