diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-07-20 12:48:42 +0000 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2024-04-26 16:15:24 +0200 |
| commit | dfb527afc3ce249d2aa4e1df0a3a72d2a307d984 (patch) | |
| tree | 2f738afb39096aaf23da68c9a1d3d45456296b50 /meta-agl-core/recipes-support | |
| parent | 79d331e29dc7b923714cd79a68719b39abe1e815 (diff) | |
Fixup ptest-runner patch for YP master
Adapt the patch to more recent ptest-runner
Change-Id: Ia51268ff25164d2ce92cf97435a9ddf4a89e0b2b
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-core/recipes-support')
| -rw-r--r-- | meta-agl-core/recipes-support/ptest-runner/ptest-runner/0007-WIP-Initial-LAVA-support.patch | 32 |
1 files changed, 18 insertions, 14 deletions
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 14c90b714..11c6fd27b 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,4 +1,4 @@ -From 552f06e025493f7e634ea9e27489861b88f45555 Mon Sep 17 00:00:00 2001 +From bdcbb0e78bbffe45719d0a27954544120f37442a 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] Initial LAVA support @@ -24,13 +24,12 @@ Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> [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.c | 17 ++++++++++++++++- utils.h | 2 +- - 4 files changed, 34 insertions(+), 2 deletions(-) + 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 flags.h diff --git a/flags.h b/flags.h @@ -85,7 +84,7 @@ index 31e4dd5..f12d6d6 100644 print_usage(stdout, argv[0]); exit(1); diff --git a/utils.c b/utils.c -index a67ac11..0c081ce 100644 +index 59b8b77..30423c4 100644 --- a/utils.c +++ b/utils.c @@ -49,6 +49,7 @@ @@ -96,28 +95,30 @@ index a67ac11..0c081ce 100644 #define GET_STIME_BUF_SIZE 1024 #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) +@@ -425,6 +426,7 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts, + } + char *ptest_dir = strdup(p->run_ptest); + char *ptest = strdup(p->ptest); if (ptest_dir == NULL) { rc = -1; break; -@@ -525,6 +527,9 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts, +@@ -477,7 +479,10 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts, fprintf(fp, "ERROR: setpgid() failed, %s\n", strerror(errno)); } +- time_t start_time= time(NULL); + if (opts.flags & LAVA_SIGNAL_ENABLE) { + fprintf(stdout, "<LAVA_SIGNAL_STARTTC %s>\n", ptest); + } - sttime = time(NULL); - fprintf(fp, "%s\n", get_stime(stime, GET_STIME_BUF_SIZE, sttime)); ++ time_t start_time = time(NULL); + fprintf(fp, "%s\n", get_stime(stime, GET_STIME_BUF_SIZE, start_time)); fprintf(fp, "BEGIN: %s\n", ptest_dir); -@@ -548,6 +553,16 @@ run_ptests(struct ptest_list *head, const struct ptest_options opts, + +@@ -594,6 +599,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)); + fprintf(fp, "%s\n", get_stime(stime, GET_STIME_BUF_SIZE, end_time)); + if (opts.flags & LAVA_SIGNAL_ENABLE) { + char result[5]; // pass\0, fail\0, skip\0 + @@ -130,7 +131,7 @@ index a67ac11..0c081ce 100644 + } } free(ptest_dir); - PTEST_LIST_ITERATE_END + do_close(&pipefd_stdout[PIPE_READ]); diff --git a/utils.h b/utils.h index 04fc666..ad702d8 100644 --- a/utils.h @@ -146,3 +147,6 @@ index 04fc666..ad702d8 100644 extern void check_allocation1(void *, size_t, char *, int, int); extern struct ptest_list *get_available_ptests(const char *); extern int print_ptests(struct ptest_list *, FILE *); +-- +2.37.3 + |