1.1 --- a/test.py	Mon Oct 26 23:44:04 2009 -0700
     1.2 +++ b/test.py	Tue Oct 27 00:19:02 2009 -0700
     1.3 @@ -202,7 +202,8 @@
     1.4      for example in dom.getElementsByTagName("Example"):
     1.5          result = get_node_text(example.getElementsByTagName("Result")[0])
     1.6          name = get_node_text(example.getElementsByTagName("Name")[0])
     1.7 -        output = "%s: Example \"%s\"\n" % (result, name)
     1.8 +        time = get_node_text(example.getElementsByTagName("ElapsedTime")[0])
     1.9 +        output = "%s: Example \"%s\" (%s)\n" % (result, name, time)
    1.10          f.write(output)
    1.11  
    1.12      f.close()
    1.13 @@ -408,12 +409,13 @@
    1.14      #
    1.15      # The table headings look like,
    1.16      #
    1.17 -    #   +--------+--------------+
    1.18 -    #   | Result | Example Name |
    1.19 -    #   +--------+--------------+
    1.20 +    #   +--------+--------------+--------------+
    1.21 +    #   | Result | Example Name | Elapsed Time |
    1.22 +    #   +--------+--------------+--------------+
    1.23      #
    1.24      f.write("<th> Result </th>\n")
    1.25      f.write("<th>Example Name</th>\n")
    1.26 +    f.write("<th>Elapsed Time</th>\n")
    1.27  
    1.28      #
    1.29      # Now iterate through all of the examples
    1.30 @@ -430,6 +432,7 @@
    1.31          #
    1.32          result = get_node_text(example.getElementsByTagName("Result")[0])
    1.33          name =   get_node_text(example.getElementsByTagName("Name")[0])
    1.34 +        time =   get_node_text(example.getElementsByTagName("ElapsedTime")[0])
    1.35  
    1.36          #
    1.37          # If the example either failed or crashed, print its result status
    1.38 @@ -448,6 +451,11 @@
    1.39          f.write("<td>%s</td>\n" % name)
    1.40  
    1.41          #
    1.42 +        # Write the elapsed time as a new tag data.
    1.43 +        #
    1.44 +        f.write("<td>%s</td>\n" % time)
    1.45 +
    1.46 +        #
    1.47          # That's it for the current example, so terminate the row.
    1.48          #
    1.49          f.write("</tr>\n")
    1.50 @@ -585,10 +593,10 @@
    1.51      if options.verbose:
    1.52          print "Synchronously execute %s" % cmd
    1.53  
    1.54 -    start_time = time.clock()
    1.55 +    start_time = time.time()
    1.56      proc = subprocess.Popen(cmd, shell = True, cwd = directory, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    1.57      stdout_results, stderr_results = proc.communicate()
    1.58 -    elapsed_time = time.clock() - start_time
    1.59 +    elapsed_time = time.time() - start_time
    1.60  
    1.61      if options.verbose:
    1.62          print "Return code = ", proc.returncode
    1.63 @@ -1153,7 +1161,7 @@
    1.64              else:
    1.65                  f.write('  <Result>CRASH</Result>\n')
    1.66  
    1.67 -            f.write('  <ElapsedTime>%s</ElapsedTime>\n' % job.elapsed_time)
    1.68 +            f.write('  <ElapsedTime>%.3f</ElapsedTime>\n' % job.elapsed_time)
    1.69              f.write('</Example>\n')
    1.70              f.close()
    1.71