Fix the recent CLIENT_JOB changes in the parser to not conflict with the SERVER_JOB changes, and to properly tie the RUNNING entry to the final CLIENT_JOB entry.
Signed-off-by: John Admanski <[email protected]> --- autotest/tko/parsers/version_1.py 2010-04-30 07:32:25.000000000 -0700 +++ autotest/tko/parsers/version_1.py 2010-05-04 11:06:37.000000000 -0700 @@ -257,14 +257,14 @@ min_stack_size = stack.size() # start a "RUNNING" CLIENT_JOB entry job_name = "CLIENT_JOB.%d" % job_count - running_job = test.parse_partial_test(self.job, None, - job_name, - "", current_kernel, - started_time) + running_client = test.parse_partial_test(self.job, None, + job_name, + "", current_kernel, + started_time) msg = "RUNNING: %s\n%s\n" - msg %= (running_job.status, running_job.testname) + msg %= (running_client.status, running_client.testname) tko_utils.dprint(msg) - new_tests.append(running_job) + new_tests.append(running_client) elif stack.size() == min_stack_size + 1 and not running_test: # we just started a new test, insert a running record running_reasons = set() @@ -353,6 +353,7 @@ # if there was no testname or subdir, use 'CLIENT_JOB' if line.testname is None: line.testname = "CLIENT_JOB.%d" % job_count + running_test = running_client job_count += 1 if not status_lib.is_worse_than_or_equal_to( current_status, "ABORT"): _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
