Makefile: libcheck now requires to link subunit

PATCH In review Aníbal Limón 4 participants 9 messages Dec 7, 2017 – Dec 12, 2017 Kbuild

lore

Share & tools

lore

Aníbal Limón

author

2017-12-07 18:51 UTC #0 lore raw

PATCH 1/3 Makefile: libcheck now requires to link subunit

From: Aníbal Limón <[email protected]>

Signed-off-by Aníbal Limón <[email protected]>

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index 434b89f..1bde7be 100644
@@ -22,7 +22,7 @@ TEST_SOURCES=tests/main.c tests/ptest_list.c tests/utils.c $(BASE_SOURCES)
 TEST_OBJECTS=$(TEST_SOURCES:.c=.o)
 TEST_EXECUTABLE=ptest-runner-test
 TEST_LDFLAGS=-lm -lrt -lpthread
-TEST_LIBSTATIC=-lcheck
+TEST_LIBSTATIC=-lcheck -lsubunit
 
 TEST_DATA=$(shell echo `pwd`/tests/data)

Signature · 1 line

2.11.0

Aníbal Limón

author

2017-12-07 18:51 UTC #1 lore raw

PATCH 2/3 Add support to avoid load/run twice a run_ptest script

From: Aníbal Limón <[email protected]>

In some ptest packages exists symlink in the ptest directory causing to load/run twice the same ptest,

For example in perl5:

/usr/lib/perl -> /usr/lib/perl5

Signed-off-by Aníbal Limón <[email protected]>

---
 ptest_list.c  | 40 ++++++++++++++++++++++++++++++++++++++++
 ptest_list.h  |  3 +++
 tests/utils.c |  1 +
 utils.c       |  6 ++++++
 4 files changed, 50 insertions(+)

ptest_list.c +40 -0

index 2e1aa30..3e393d5 100644
@@ -110,6 +110,46 @@ ptest_list_search(struct ptest_list *head, char *ptest)
 	return q;
 }
 
+
+struct ptest_list *
+ptest_list_search_by_file(struct ptest_list *head, char *run_ptest, struct stat st_buf)
+{
+	struct ptest_list *q = NULL;
+	struct ptest_list *p;
+	struct stat st_buf_p;
+
+	VALIDATE_PTR_RNULL(head);
+	VALIDATE_PTR_RNULL(run_ptest);
+
+	for (p = head; p != NULL; p = p->next) {
+		if (p->ptest == NULL) 
+			continue;
+
+		if (stat(p->run_ptest, &st_buf_p) == -1)
+			continue;
+
+		if (strcmp(p->run_ptest, run_ptest) == 0) {
+			q = p;
+			break;
+		}
+
+		/* *
+		 * In some ptest packages exists symlink in the ptest directory
+		 * causing to load/run twice the same ptest, 
+		 *
+		 * For example in perl5:
+		 * /usr/lib/perl -> /usr/lib/perl5
+		 * */
+		if (st_buf.st_dev == st_buf_p.st_dev &&
+		    st_buf.st_ino == st_buf_p.st_ino) {
+			q = p;
+			break;
+		}
+	}
+
+	return q;
+}
+
 struct ptest_list *
 ptest_list_add(struct ptest_list *head, char *ptest, char *run_ptest)
 {

ptest_list.h +3 -0

index 8b39485..03d7539 100644
@@ -28,6 +28,8 @@
 #define PTEST_LIST_ITERATE_START(head, p) for (p = head->next; p != NULL; p = p->next) { 
 #define PTEST_LIST_ITERATE_END }
 
+#include <sys/stat.h>
+
 struct ptest_list {
 	char *ptest;
 	char *run_ptest;

@@ -42,6 +44,7 @@ extern int ptest_list_free_all(struct ptest_list *);
 
 extern int ptest_list_length(struct ptest_list *);
 extern struct ptest_list *ptest_list_search(struct ptest_list *, char *);
+extern struct ptest_list *ptest_list_search_by_file(struct ptest_list *, char *, struct stat);
 extern struct ptest_list *ptest_list_add(struct ptest_list *, char *, char *);
 extern struct ptest_list *ptest_list_remove(struct ptest_list *, char *, int);

tests/utils.c +1 -0

index ecf3e8a..cf09379 100644
@@ -48,6 +48,7 @@ static int ptests_found_length = 6;
 static char *ptests_not_found[] = {
 	"busybox",
 	"perl",
+	"python3",
 	NULL,
 };

utils.c +6 -0

index 933eced..ed2eff7 100644
@@ -143,6 +143,12 @@ get_available_ptests(const char *dir)
 				continue;
 			}
 
+			if (ptest_list_search_by_file(head, run_ptest, st_buf)) {
+				free(run_ptest);
+				free(d_name);
+				continue;
+			}
+
 			struct ptest_list *p = ptest_list_add(head,
 				d_name, run_ptest);
 			CHECK_ALLOCATION(p, sizeof(struct ptest_list *), 0);

Signature · 1 line

2.11.0

Aníbal Limón

author

2017-12-07 18:51 UTC #2 lore raw

PATCH 3/3 README.md: Update to my current email

In reply to Aníbal Limón

From: Aníbal Limón <[email protected]>

Signed-off-by Aníbal Limón <[email protected]>

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

README.md +1 -1

index fedab04..22b36a4 100644
@@ -50,7 +50,7 @@ $ mtrace ./ptest-runner $(MALLOC_TRACE)
 
 For contribute please send a patch with subject prefix "[ptest-runner]" to 
 [email protected] and cc the current maintainer that is Aníbal Limón 
-<[email protected]>.
+<[email protected]>.
 
 ## Links

Signature · 1 line

2.11.0

Joshua Lock

2017-12-07 22:00 UTC #3 lore raw

Re: [ptest-runner 3/3] README.md: Update to my current email

Quoted 12 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>
Signed-off-by Aníbal Limón <[email protected]>
---
  README.md | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
README.md +0 -0
index fedab04..22b36a4 100644

README.md $ mtrace ./ptest-runner $(MALLOC_TRACE) · line 53

Quoted 5 lines

README.md +1 -1

@@ -50,7 +50,7 @@ $ mtrace ./ptest-runner $(MALLOC_TRACE)
 
  For contribute please send a patch with subject prefix "[ptest-runner]" to
  [email protected] and cc the current maintainer that is Aníbal Limón
-<[email protected]>.
+<[email protected]>.

I take this to mean that you'd still like to maintain ptest-runner?

We have patches on the list which could use review from someone more familiar with ptest-runner than me…

Joshua
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

Anibal Limón

author

2017-12-07 22:11 UTC #4 lore raw

Re: [ptest-runner 3/3] README.md: Update to my current email

Quoted 26 lines · Joshua Lock

Quoted 13 lines · Aníbal Limón
From: Aníbal Limón <[email protected]>
Signed-off-by Aníbal Limón <[email protected]>
---
  README.md | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
README.md +0 -0
index fedab04..22b36a4 100644
@@ -50,7 +50,7 @@ $ mtrace ./ptest-runner $(MALLOC_TRACE)
    For contribute please send a patch with subject prefix
Quoted 6 lines
"[ptest-runner]" to
[email protected] and cc the current maintainer that is Aníbal
Limón
-<[email protected]>. +<[email protected]>.
I take this to mean that you'd still like to maintain ptest-runner?

Quoted 3 lines

We have patches on the list which could use review from someone more familiar with ptest-runner than me…

Yes, i can look into that patches.

Can you point me the patches?,

Cheers,
Anibal

Quoted 13 lines

Joshua
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

Joshua Lock

2017-12-08 08:38 UTC #5 lore raw

Re: [ptest-runner 3/3] README.md: Update to my current email

Quoted 31 lines · Anibal Limón

On Thu, Dec 7, 2017 at 4:00 PM, Joshua Lock <[email protected] <mailto:[email protected]>> wrote:
On 07/12/17 18:51, Aníbal Limón wrote:
From: Aníbal Limón <[email protected] <mailto:[email protected]>>
Signed-off-by Aníbal Limón <[email protected]
<mailto:[email protected]>>
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index fedab04..22b36a4 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ $ mtrace ./ptest-runner $(MALLOC_TRACE)
For contribute please send a patch with subject prefix
"[ptest-runner]" to
[email protected] <mailto:[email protected]> and cc the current maintainer that is Aníbal Limón -<[email protected] <mailto:[email protected]>>. +<[email protected] <mailto:[email protected]>>.

Quoted 7 lines

I take this to mean that you'd still like to maintain ptest-runner?
We have patches on the list which could use review from someone more familiar with ptest-runner than me…
Yes, i can look into that patches.

Thanks!

Quoted 1 line

Can you point me the patches?,

Thread of submissions from Jiwei at WR here:
https://lists.yoctoproject.org/pipermail/yocto/2017-September/038203.html

I provided high-level review of some patches:
https://lists.yoctoproject.org/pipermail/yocto/2017-October/038271.html
https://lists.yoctoproject.org/pipermail/yocto/2017-October/038272.html
https://lists.yoctoproject.org/pipermail/yocto/2017-October/038273.html
https://lists.yoctoproject.org/pipermail/yocto/2017-October/038274.html

Joshua

Quoted 19 lines

Cheers,
Anibal
Joshua
---------------------------------------------------------------------
Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

Joshua Lock

2017-12-12 12:24 UTC #6 lore raw

In reply to Aníbal Limón

This entire series merged to master of the ptest-runner2 repository.

Will you be sending a recipe update?

Thanks,
Joshua

Quoted 21 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

Signed-off-by Aníbal Limón <[email protected]>

---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index 434b89f..1bde7be 100644
@@ -22,7 +22,7 @@ TEST_SOURCES=tests/main.c tests/ptest_list.c tests/utils.c $(BASE_SOURCES)
  TEST_OBJECTS=$(TEST_SOURCES:.c=.o)
  TEST_EXECUTABLE=ptest-runner-test
  TEST_LDFLAGS=-lm -lrt -lpthread
-TEST_LIBSTATIC=-lcheck
+TEST_LIBSTATIC=-lcheck -lsubunit
 
  TEST_DATA=$(shell echo `pwd`/tests/data)

Anibal Limon

2017-12-12 14:18 UTC #7 lore raw

Quoted 4 lines · Joshua Lock

This entire series merged to master of the ptest-runner2 repository.
Will you be sending a recipe update?

Yes, can you create the v2.1.1 tag pointing current master?

Cheers,
Anibal

Quoted 29 lines

Thanks,
Joshua

Quoted 21 lines · Aníbal Limón

From: Aníbal Limón <[email protected]>

Signed-off-by Aníbal Limón <[email protected]>

---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index 434b89f..1bde7be 100644
@@ -22,7 +22,7 @@ TEST_SOURCES=tests/main.c tests/ptest_list.c
 tests/utils.c $(BASE_SOURCES)
  TEST_OBJECTS=$(TEST_SOURCES:.c=.o)
  TEST_EXECUTABLE=ptest-runner-test
  TEST_LDFLAGS=-lm -lrt -lpthread
-TEST_LIBSTATIC=-lcheck
+TEST_LIBSTATIC=-lcheck -lsubunit
    TEST_DATA=$(shell echo `pwd`/tests/data)

Joshua Lock

2017-12-12 15:45 UTC #8 lore raw

Quoted 10 lines · Anibal Limon

On 12 December 2017 at 06:24, Joshua Lock <[email protected] <mailto:[email protected]>> wrote:
This entire series merged to master of the ptest-runner2 repository.
Will you be sending a recipe update?
Yes, can you create the v2.1.1 tag pointing current master?

Done:

http://git.yoctoproject.org/clean/cgit.cgi/ptest-runner2/tag/?id=v2.1.1

Thanks,
Joshua