diff mbox series

ltp-pan: Increase allowed width of test name in logs

Message ID 20180726155139.11246-1-punit.agrawal@arm.com
State Changes Requested
Headers show
Series ltp-pan: Increase allowed width of test name in logs | expand

Commit Message

Punit Agrawal July 26, 2018, 3:51 p.m. UTC 
ltp-pan truncates the test name when logging the outcome of
tests. This is causing issues with tooling which is expecting to parse
unique test names from the log.

cgroup_fj_stress_cpuacct_2_2_o PASS       0
cgroup_fj_stress_cpuacct_3_3_o PASS       0
cgroup_fj_stress_cpuacct_4_4_o PASS       0
cgroup_fj_stress_cpuacct_2_9_o PASS       0
cgroup_fj_stress_cpuacct_10_3_ PASS       0

Fix this by increasing the expected size of test name and removing the
hard restriction on the size of the name. Refactor the format string
into a global variable as it seems to be repeated multiple times.

Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
---
Hi,

This was noticed after we enabled the cgroup_fj_stress* tests. The
problem leads to the result parsing scripts to fail.

Thanks,
Punit

 pan/ltp-pan.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Cyril Hrubis July 30, 2018, 12:19 p.m. UTC | #1 
Hi!
> +static char *result_fmt = "%-50s %-10.10s %-10.10s\n";

This should be a macro otherwise the compilation will fail for some
compilers since the format string passed to fprintf() is not a static
string.


Other than that it looks fine.
diff mbox series

Patch

diff --git a/pan/ltp-pan.c b/pan/ltp-pan.c
index a2bb9b7ef..65bc4cae7 100644
--- a/pan/ltp-pan.c
+++ b/pan/ltp-pan.c
@@ -129,6 +129,7 @@  static char *panname = NULL;
 static char *test_out_dir = NULL;	/* dir to buffer output to */
 zoo_t zoofile;
 static char *reporttype = NULL;
+static char *result_fmt = "%-50s %-10.10s %-10.10s\n";
 
 /* zoolib */
 int rec_signal;			/* received signal */
@@ -350,9 +351,9 @@  int main(int argc, char **argv)
 			fprintf(logfile, "Test Start Time: %s\n", s);
 			fprintf(logfile,
 				"-----------------------------------------\n");
-			fprintf(logfile, "%-30.20s %-10.10s %-10.10s\n",
+			fprintf(logfile, result_fmt,
 				"Testcase", "Result", "Exit Value");
-			fprintf(logfile, "%-30.20s %-10.10s %-10.10s\n",
+			fprintf(logfile, result_fmt,
 				"--------", "------", "------------");
 		}
 		fflush(logfile);
@@ -825,7 +826,7 @@  check_pids(struct tag_pgrp *running, int *num_active, int keep_active,
 						}
 
 						fprintf(logfile,
-							"%-30.30s %-10.10s %-5d\n",
+							result_fmt,
 							running[i].cmd->name,
 							result_str,
 							w);
@@ -1104,7 +1105,7 @@  run_child(struct coll_entry *colle, struct tag_pgrp *active, int quiet_mode,
 				if (termid != 0)
 					++ * failcnt;
 
-				fprintf(logfile, "%-30.30s %-10.10s %-5d\n",
+				fprintf(logfile, result_fmt,
 					colle->name,
 					((termid != 0) ? "FAIL" : "PASS"),
 					termid);