X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Frecipes-support%2Fptest-runner%2Fptest-runner%2F0007-WIP-Initial-LAVA-support.patch;h=14c90b714ac7a183418ae650e9c3793d092cfa0b;hb=refs%2Fchanges%2F97%2F29697%2F2;hp=6232c4fa4031f8a628d4f49bfeb02dcc2d1c4ac8;hpb=1c3c06842ac1b9c089d0a08e91c60f44e4844fac;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core/recipes-support/ptest-runner/ptest-runner/0007-WIP-Initial-LAVA-support.patch b/meta-agl-core/recipes-support/ptest-runner/ptest-runner/0007-WIP-Initial-LAVA-support.patch
index 6232c4fa4..14c90b714 100644
--- a/meta-agl-core/recipes-support/ptest-runner/ptest-runner/0007-WIP-Initial-LAVA-support.patch
+++ b/meta-agl-core/recipes-support/ptest-runner/ptest-runner/0007-WIP-Initial-LAVA-support.patch
@@ -1,7 +1,7 @@
-From 11b29ce444610a07067a89b38e9e85c2162bbf67 Mon Sep 17 00:00:00 2001
+From 552f06e025493f7e634ea9e27489861b88f45555 Mon Sep 17 00:00:00 2001
 From: Tim Orling <timothy.t.orling@linux.intel.com>
 Date: Mon, 15 Oct 2018 18:30:42 -0700
-Subject: [PATCH 7/7] [WIP] Initial LAVA support
+Subject: [PATCH] Initial LAVA support
 
 Linaro Automated Validation Architecture (LAVA) launches a test suite
 on the target but thereafter only observes stdout.
@@ -17,10 +17,22 @@ emitted to stdout:
 
 It is valid to have a measurement without units, but not units without a measurement.
 
+Upstream-Status: Pending
+
 Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
 [updated for ptest-runner 2.3.2]
+[updated for ptest-runner 2.4.1]
+[updated for ptest-runner 2.4.2]
 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
 ---
+ flags.h | 10 ++++++++++
+ main.c  |  9 ++++++++-
+ utils.c | 15 +++++++++++++++
+ utils.h |  2 +-
+ 4 files changed, 34 insertions(+), 2 deletions(-)
+ create mode 100644 flags.h
+
 diff --git a/flags.h b/flags.h
 new file mode 100644
 index 0000000..0dac223
@@ -38,7 +50,7 @@ index 0000000..0dac223
 +
 +#endif				/* __FLAGS_H__ */
 diff --git a/main.c b/main.c
-index 01d60f7..165370f 100644
+index 31e4dd5..f12d6d6 100644
 --- a/main.c
 +++ b/main.c
 @@ -38,6 +38,7 @@
@@ -49,7 +61,7 @@ index 01d60f7..165370f 100644
  
  #ifndef DEFAULT_DIRECTORY
  #define DEFAULT_DIRECTORY "/usr/lib"
-@@ -74,8 +75,9 @@ main(int argc, char *argv[])
+@@ -130,8 +131,9 @@ main(int argc, char *argv[])
  	opts.timeout = DEFAULT_TIMEOUT;
  	opts.ptests = NULL;
  	opts.xml_filename = NULL;
@@ -59,8 +71,8 @@ index 01d60f7..165370f 100644
 +	while ((opt = getopt(argc, argv, "d:e:lt:x:Lh")) != -1) {
  		switch (opt) {
  			case 'd':
- 				free(opts.directory);
-@@ -122,6 +124,11 @@ main(int argc, char *argv[])
+ 				free(opts.dirs[0]);
+@@ -156,6 +158,11 @@ main(int argc, char *argv[])
  				opts.xml_filename = strdup(optarg);
  				CHECK_ALLOCATION(opts.xml_filename, 1, 1);
  			break;
@@ -73,18 +85,18 @@ index 01d60f7..165370f 100644
  				print_usage(stdout, argv[0]);
  				exit(1);
 diff --git a/utils.c b/utils.c
-index a8ba190..19f9efa 100644
+index a67ac11..0c081ce 100644
 --- a/utils.c
 +++ b/utils.c
-@@ -47,6 +47,7 @@
+@@ -49,6 +49,7 @@
  
  #include "ptest_list.h"
  #include "utils.h"
 +#include "flags.h"
  
  #define GET_STIME_BUF_SIZE 1024
- #define WAIT_CHILD_POLL_TIMEOUT_MS 200
-@@ -439,6 +440,7 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
+ #define WAIT_CHILD_BUF_MAX_SIZE 1024
+@@ -483,6 +484,7 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
  		fprintf(fp, "START: %s\n", progname);
  		PTEST_LIST_ITERATE_START(head, p)
  			char *ptest_dir = strdup(p->run_ptest);
@@ -92,13 +104,7 @@ index a8ba190..19f9efa 100644
  			if (ptest_dir == NULL) {
  				rc = -1;
  				break;
-@@ -480,11 +482,15 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
- 				int status;
- 				int fds[2]; fds[0] = pipefd_stdout[0]; fds[1] = pipefd_stderr[0];
- 				FILE *fps[2]; fps[0] = fp; fps[1] = fp_stderr;
-+				char result[5]; // pass\0, fail\0, skip\0
- 
- 				if (setpgid(child, pgid) == -1) {
+@@ -525,6 +527,9 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
  					fprintf(fp, "ERROR: setpgid() failed, %s\n", strerror(errno));
  				}
  
@@ -108,11 +114,13 @@ index a8ba190..19f9efa 100644
  				sttime = time(NULL);
  				fprintf(fp, "%s\n", get_stime(stime, GET_STIME_BUF_SIZE, sttime));
  				fprintf(fp, "BEGIN: %s\n", ptest_dir);
-@@ -506,6 +512,14 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
+@@ -548,6 +553,16 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts,
  
  				fprintf(fp, "END: %s\n", ptest_dir);
  				fprintf(fp, "%s\n", get_stime(stime, GET_STIME_BUF_SIZE, entime));
 +				if (opts.flags & LAVA_SIGNAL_ENABLE) {
++					char result[5]; // pass\0, fail\0, skip\0
++
 +					if (status)
 +						sprintf(result, "fail");
 +					else
@@ -121,14 +129,14 @@ index a8ba190..19f9efa 100644
 +					fprintf(stdout, "<LAVA_SIGNAL_TESTCASE TEST_CASE_ID=%s RESULT=%s>\n", ptest, result);
 +				}
  			}
+ 			free(ptest_dir);
  		PTEST_LIST_ITERATE_END
- 		fprintf(fp, "STOP: %s\n", progname);
 diff --git a/utils.h b/utils.h
-index aa53707..df11e24 100644
+index 04fc666..ad702d8 100644
 --- a/utils.h
 +++ b/utils.h
-@@ -39,9 +39,9 @@ struct ptest_options {
- 	int timeout;
+@@ -42,9 +42,9 @@ struct ptest_options {
+ 	unsigned int timeout;
  	char **ptests;
  	char *xml_filename;
 +	unsigned int flags;