Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4106 into donut

Browse Source 
* changes:
  Adjust order of file/section list in output diff
This commit is contained in:
Android (Google) Code Review
2009-06-15 09:37:01 -07:00
parent 0304325dd7 903f311fdc
commit d83d6606d6
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/DumpRenderTree/assets/run_layout_tests.py
View File

@@ -61,7 +61,8 @@ def DumpRenderTreeFinished(adb_cmd):
adb_output = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] adb_output = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
return adb_output.strip() == "#DONE" return adb_output.strip() == "#DONE"
def DiffResults(marker, new_results, old_results, diff_results, strip_reason): def DiffResults(marker, new_results, old_results, diff_results, strip_reason,
new_count_first=True):
""" Given two result files, generate diff and """ Given two result files, generate diff and
write to diff_results file. All arguments are absolute paths write to diff_results file. All arguments are absolute paths
to files. to files.
@@ -85,21 +86,25 @@ def DiffResults(marker, new_results, old_results, diff_results, strip_reason):
for i in range(0, len(cdict)): for i in range(0, len(cdict)):
cdict[i] = cdict[i].split(' ')[0] + "\n" cdict[i] = cdict[i].split(' ')[0] + "\n"
# Find results in new_results missing in old_results params = {
new_count=0 "new": [0, ndict, cdict, "+"],
for line in ndict: "miss": [0, cdict, ndict, "-"]
if line not in cdict: }
diff_file.writelines("+ " + line) if new_count_first:
new_count += 1 order = ["new", "miss"]
else:
order = ["miss", "new"]
# Find results in old_results missing in new_results for key in order:
missing_count=0 for line in params[key][1]:
for line in cdict: if line not in params[key][2]:
if line not in ndict: if line[-1] != "\n":
diff_file.writelines("- " + line) line += "\n";
missing_count += 1 diff_file.writelines(params[key][3] + line)
params[key][0] += 1
logging.info(marker + " >>> " + str(new_count) + " new, " + str(missing_count) + " misses") logging.info(marker + " >>> " + str(params["new"][0]) + " new, " +
str(params["miss"][0]) + " misses")
diff_file.writelines("\n\n") diff_file.writelines("\n\n")
@@ -121,12 +126,12 @@ def CompareResults(ref_dir, results_dir):
if os.path.exists(diff_result): if os.path.exists(diff_result):
os.remove(diff_result) os.remove(diff_result)
files=["passed", "failed", "nontext", "crashed"] files=["crashed", "failed", "passed", "nontext"]
for f in files: for f in files:
result_file_name = "layout_tests_" + f + ".txt" result_file_name = "layout_tests_" + f + ".txt"
DiffResults(f, os.path.join(results_dir, result_file_name), DiffResults(f, os.path.join(results_dir, result_file_name),
os.path.join(ref_dir, result_file_name), diff_result, os.path.join(ref_dir, result_file_name), diff_result,
f == "failed") False, files != "passed")
logging.info("Detailed diffs are in " + diff_result) logging.info("Detailed diffs are in " + diff_result)
def main(options, args): def main(options, args):