diff options
Diffstat (limited to 'meta/recipes-support/attr/acl')
3 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch index ba2ffee5d2..219feaccd0 100644 --- a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch +++ b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch @@ -1,4 +1,4 @@ -From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001 +From 7dec6fa3b3494a55120402ff1ea3eb96b67138e8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 12 Dec 2019 15:47:49 +0100 Subject: [PATCH] test: patch out failing bits @@ -58,6 +58,3 @@ index 8f8f825..21e8a95 100644 $ : > f $ : <> f >~ .*f: Permission denied$ --- -2.17.1 - diff --git a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch index 57ef0bb728..748f37f3e7 100644 --- a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch +++ b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch @@ -1,4 +1,4 @@ -From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001 +From 42ae3f8a5e32ba0681ccd1552a203ddad8748a6e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 12 Dec 2019 13:45:52 +0100 Subject: [PATCH] tests: do not hardcode the build path into a helper library @@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makemodule.am b/test/Makemodule.am -index 17d4927..015de7f 100644 +index e1d715d..cffe732 100644 --- a/test/Makemodule.am +++ b/test/Makemodule.am @@ -30,7 +30,7 @@ EXTRA_DIST += \ @@ -21,4 +21,4 @@ index 17d4927..015de7f 100644 +libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) - AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH"; + # Make sure translations don't break tests when matching output. diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest index 4312823365..3af75c84fe 100644 --- a/meta/recipes-support/attr/acl/run-ptest +++ b/meta/recipes-support/attr/acl/run-ptest @@ -7,4 +7,10 @@ mkdir -p /tmp/acl-ptest/test cp test/test.* /tmp/acl-ptest/test +set +e make test-suite.log +exitcode=$? +if [ $exitcode -ne 0 -a -e test-suite.log ]; then + cat test-suite.log +fi +exit $exitcode |