aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2017-10-18 16:48:01 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2017-10-19 10:45:57 -0700
commit73a261f238296df5552097442ee88979f5f70016 (patch)
treebe46e956eab6a6dd64709aa747132dd7736ba954
parente9626fefa176d79620dbf24982c60509fa3f3da2 (diff)
downloadsbsigntools-73a261f238296df5552097442ee88979f5f70016.tar.gz
make check: fix test environment problem
autotest is very finicky. The environment can't be set up in SH_LOG_COMPILER, but have to be done in AM_TESTS_ENVIRONMENT instead, so fix this. Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--tests/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8085d5c..793ab26 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,7 +58,8 @@ TESTS = sign-verify.sh \
detach-remove.sh
TEST_EXTENSIONS = .sh
-SH_LOG_COMPILER = TEST_ARCHES="$(test_arches)" $(srcdir)/test-wrapper.sh
+AM_TESTS_ENVIRONMENT = TEST_ARCHES='$(test_arches)'; export TEST_ARCHES;
+SH_LOG_COMPILER = $(srcdir)/test-wrapper.sh
EXTRA_DIST = $(test_lds) test.S $(TESTS) $(check_SCRIPTS)
CLEANFILES = $(test_key) $(test_cert) $(test_images)