test-bugzilla-files/analyze_logs.py |    2 +-
 test-bugzilla-files/zip.sh          |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 62e8517e05674f67f0773a6a628a976a5c69d6d6
Author:     Miklos Vajna <[email protected]>
AuthorDate: Wed Oct 13 09:26:07 2021 +0200
Commit:     Miklos Vajna <[email protected]>
CommitDate: Mon Oct 18 16:03:13 2021 +0200

    crashtest: switch mail template to per-run odfundifflog.csv
    
    It used to have a .txt extension, but that's no longer true since it has
    multiple columns.
    
    Also use the new extension when updating the long-term .csv file that
    tracks the state for multiple runs.
    
    Change-Id: Ic3f5c6bee8df7a38394cf0c626ab4adad96918df

diff --git a/test-bugzilla-files/analyze_logs.py 
b/test-bugzilla-files/analyze_logs.py
index 760b806..c2c426a 100644
--- a/test-bugzilla-files/analyze_logs.py
+++ b/test-bugzilla-files/analyze_logs.py
@@ -115,7 +115,7 @@ def update_validation():
 
 def update_odfundiff():
     differences = dict()
-    analyze_odfundifflog("odfundifflog.txt", differences)
+    analyze_odfundifflog("odfundifflog.csv", differences)
     reader = import_csv("odfundiff.csv")
     export_csv("odfundiff.csv", differences, reader)
 
diff --git a/test-bugzilla-files/zip.sh b/test-bugzilla-files/zip.sh
index 4b52fb1..a923cb5 100755
--- a/test-bugzilla-files/zip.sh
+++ b/test-bugzilla-files/zip.sh
@@ -11,7 +11,8 @@ cat */crashlog.txt > /srv/crashtestdata/logs/$SHA/crashlog.txt
 cat */exportCrash.txt > /srv/crashtestdata/logs/$SHA/exportCrash.txt
 echo "attr-diff-count,filename,node-diff-count,total-diff-count" > 
/srv/crashtestdata/logs/$SHA/odfundifflog.csv
 cat */odfundifflog.csv >> /srv/crashtestdata/logs/$SHA/odfundifflog.csv
-num_of_odf_diffs=$(< "/srv/crashtestdata/logs/$SHA/odfundifflog.txt" wc -l)
+# Ignore the header.
+num_of_odf_diffs=$(($(< "/srv/crashtestdata/logs/$SHA/odfundifflog.csv" wc 
-l)-1))
 num_of_import_crashes=$(< "/srv/crashtestdata/logs/$SHA/crashlog.txt" wc -l)
 num_of_export_crashes=$(< "/srv/crashtestdata/logs/$SHA/exportCrash.txt" wc -l)
 num_of_excluded_file=$(< "/srv/crashtestdata/odfundiff_exclude_list.txt" wc -l)

Reply via email to