diff --git a/gui/basic_regression.bash b/gui/basic_regression.bash index 3591f3be..bfe0b83b 100755 --- a/gui/basic_regression.bash +++ b/gui/basic_regression.bash @@ -355,7 +355,7 @@ then GITLOG=NA fi -./lf_gui_report_summary.pl --title "TIP Test Bed Results" --dir $RSLTS_DIR --gitlog $GITLOG --notes $NOTES_HTML < index_template.html > $RSLTS_DIR/index.html +./lf_gui_report_summary.pl --title "$TEST_RIG_ID: $DUT_SW_VER" --dir $RSLTS_DIR --gitlog $GITLOG --notes $NOTES_HTML < index_template.html > $RSLTS_DIR/index.html echo "Done with regression test." echo "Results-Dir: $RSLTS_DIR" diff --git a/gui/kpi.java b/gui/kpi.java index 2fc8c3c5..efab987c 100644 --- a/gui/kpi.java +++ b/gui/kpi.java @@ -177,6 +177,21 @@ public class kpi { else if (fname.startsWith("kpi-") && fname.endsWith(".png")) { test.addKpiImage(fname); } + else if (fname.equals("logs")) { + File logs_csv = new File(f3.getAbsolutePath() + File.separator + "logs.csv"); + if (logs_csv.exists()) { + try { + BufferedReader br = new BufferedReader(new FileReader(logs_csv)); + String line; + while ((line = br.readLine()) != null) { + test.addLogCsv(line); + } + } + catch (Exception e) { + e.printStackTrace(); + } + } + } }// for all files in the test dir } } @@ -468,10 +483,42 @@ public class kpi { for (int i = 0; i 0) { + logs_str.append(redTd(logv + "")); + } + else { + logs_str.append(greenTd(logv + "")); + } + + logv = run.getLogWarnings(); + if (logv > 0) { + logs_str.append(redTd(logv + "")); + } + else { + logs_str.append(greenTd(logv + "")); + } + + logv = run.getLogCrashes(); + if (logv > 0) { + logs_str.append(redTd(logv + "")); + } + else { + logs_str.append(greenTd(logv + "")); + } + + logv = run.getLogRestarting(); + if (logv > 0) { + logs_str.append(redTd(logv + "")); + } + else { + logs_str.append(greenTd(logv + "")); + } + String row_text = ("" + i + "" + run.getName() + "" + run.getDate() + "" + run.getDutHwVer() + "" + run.getDutSwVer() - + "" + run.getDutModelNum() + "" + greenTd(run.getPass() + "") + redTd(run.getFail() + "") + "\n"); + + "" + run.getDutModelNum() + "" + greenTd(run.getPass() + "") + redTd(run.getFail() + "") + logs_str + "\n"); if (i == (runs.size() - 1)) { // Last run int png_row_count = 0; @@ -704,9 +751,15 @@ class Test { Vector data = new Vector(); Hashtable descs = new Hashtable(); Vector kpi_images = new Vector(); + Vector log_csv = new Vector(); int pass = 0; int fail = 0; + int log_bugs = 0; + int log_warnings = 0; + int log_crashes = 0; + int log_restarting = 0; + long date_ms = 0; public String date = "NA"; public String test_rig = "NA"; @@ -719,6 +772,22 @@ class Test { name = n; } + public int getLogBugs() { + return log_bugs; + } + + public int getLogWarnings() { + return log_warnings; + } + + public int getLogCrashes() { + return log_crashes; + } + + public int getLogRestarting() { + return log_restarting; + } + public String toString() { return "Name: " + name; } @@ -768,6 +837,25 @@ class Test { return name; } + void addLogCsv(String l) { + log_csv.add(l); + try { + StringTokenizer st = new StringTokenizer(l, "\t"); + String tok = st.nextToken(); + if (tok.equals("FILE")) { + // title, ignore rest of this title + return; + } + log_bugs += Long.valueOf(st.nextToken()); + log_warnings += Long.valueOf(st.nextToken()); + log_crashes += Long.valueOf(st.nextToken()); + log_restarting += Long.valueOf(st.nextToken()); + } + catch (Exception e) { + e.printStackTrace(); + } + } + void addLine(String l) { if (titles == null) { titles = new Vector(); @@ -877,6 +965,38 @@ class Run { return fail; } + int getLogBugs() { + int fail = 0; + for (Test t: testsv) { + fail += t.getLogBugs(); + } + return fail; + } + + int getLogWarnings() { + int fail = 0; + for (Test t: testsv) { + fail += t.getLogWarnings(); + } + return fail; + } + + int getLogCrashes() { + int fail = 0; + for (Test t: testsv) { + fail += t.getLogCrashes(); + } + return fail; + } + + int getLogRestarting() { + int fail = 0; + for (Test t: testsv) { + fail += t.getLogRestarting(); + } + return fail; + } + Test getFirstTest() { return testsv.elementAt(0); } diff --git a/gui/testbed_template.html b/gui/testbed_template.html index a457ac8d..e9784dcd 100644 --- a/gui/testbed_template.html +++ b/gui/testbed_template.html @@ -25,7 +25,7 @@

Latest test run details.

- + ___LATEST_RUN___
Test IDTest RunDateDUT HardwareDUT SofwareDUT ModelPassFail
Test IDTest RunDateDUT HardwareDUT SofwareDUT ModelPassFailLog BugsWarningsCrashesOther
@@ -49,7 +49,7 @@ ___LATEST_RUN_PNGS___

Individual Test Run Details for all data sets.

- + ___TEST_RUNS___
Test IDTest RunDateDUT HardwareDUT SofwareDUT ModelPassFail
Test IDTest RunDateDUT HardwareDUT SofwareDUT ModelPassFailLog BugsWarningsCrashesOther