[LNT] r218678 - During rerun, fix full test benchmark path to be the same as only_test

[Chris Matthews]

Author: cmatthews
Date: Tue Sep 30 10:47:36 2014
New Revision: 218678

URL: http://llvm.org/viewvc/llvm-project?rev=218678&view=rev
Log:
During rerun, fix full test benchmark path to be the same as only_test

When doing reruns for the full test suite, the reruns benchmark name is 
being incorrectly reported to the server.  This adds the benchmark’s path
back on when reruns happen in the full test suite mode.

Modified:
    lnt/trunk/lnt/tests/nt.py

Modified: lnt/trunk/lnt/tests/nt.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/nt.py?rev=218678&r1=218677&r2=218678&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/nt.py (original)
+++ lnt/trunk/lnt/tests/nt.py Tue Sep 30 10:47:36 2014
@@ -84,6 +84,7 @@ class TestConfiguration(object):
         self._cc_info = None
         # Getting compiler version spawns subprocesses, cache it.
         self._get_source_version = None
+        self.rerun_test = None
 
     @property
     def report_dir(self):
@@ -715,6 +716,9 @@ def load_nt_report_file(report_path, con
 
         if config.only_test is not None:
             program = os.path.join(config.only_test, program)
+        if config.rerun_test is not None:
+            program = os.path.join(config.rerun_test, program)
+
         program_real = program
         program_mangled = program.replace('.','_')
         test_base_name = program_mangled
@@ -1152,7 +1156,7 @@ def _execute_test_again(config, test_nam
     else:
         if test_relative_path:
             to_exec.extend(['-C', test_relative_path])
-
+            config.rerun_test = test_relative_path
     # The target for the specific benchmark.
     # Make target.
     benchmark_report_target =  "Output/" + test_name + \