From c17b8013ce39cb07825e069fdd5592dd535a6b2d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 2 Aug 2023 20:02:30 +0200 Subject: [PATCH] curl: ensure all ptest failures are caught Piping results through sed is masking failures that aren't picked up by sed expressions. One such failure probes the source tree, and so isn't relevant for target testing, and can be disabled. (From OE-Core rev: 3afb1edc760a7cc1048aa9ae009a8cc6d32f9e89) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 86c96cbf68d986b44fdb45e988343ce29d6b8cc7) Signed-off-by: Steve Sakoman --- meta/recipes-support/curl/curl/disable-tests | 2 ++ meta/recipes-support/curl/curl/run-ptest | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/curl/curl/disable-tests b/meta/recipes-support/curl/curl/disable-tests index 92056bd8ca..b687b2bb76 100644 --- a/meta/recipes-support/curl/curl/disable-tests +++ b/meta/recipes-support/curl/curl/disable-tests @@ -18,6 +18,8 @@ 1165 # This CRL test is looking for src files 1185 +# This test is scanning the source tree +1222 # These CRL tests need --libcurl option to be enabled 1400 1401 diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest index 614e822922..2c74c58f5d 100644 --- a/meta/recipes-support/curl/curl/run-ptest +++ b/meta/recipes-support/curl/curl/run-ptest @@ -1,6 +1,6 @@ #!/bin/sh cd tests -./runtests.pl -a -n -s | sed \ +{ ./runtests.pl -a -n -s || echo "FAIL: curl" ; } | sed \ -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//'