summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2014-08-24 21:57:50 +0300
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2014-08-25 19:23:37 +0200
commit596a4ced3c47456298e83e3fad722ee09db72259 (patch)
treea8c8fb7cbe60b32266859a7ced8dff63fa4223a7 /tests
parent94e6c32fbaf47467f3ae06df6558938b625393df (diff)
downloadgnutls-596a4ced3c47456298e83e3fad722ee09db72259.tar.gz
build: tests: x509cert-tl: support separate builddir
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/x509cert-tl.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6638fce516..608135836a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -128,6 +128,7 @@ TESTS_ENVIRONMENT = \
PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12 \
PKCS12PASSWORD_2="" \
PKCS12PATH=$(srcdir)/pkcs12-decode/ \
+ X509CERTDIR=$(srcdir)/x509cert-dir/ \
EXEEXT=$(EXEEXT) \
top_builddir="$(top_builddir)" \
srcdir="$(srcdir)"
diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c
index dad78601db..5ecc03e424 100644
--- a/tests/x509cert-tl.c
+++ b/tests/x509cert-tl.c
@@ -189,6 +189,7 @@ static time_t mytime(time_t * t)
void doit(void)
{
int ret;
+ const char *path;
gnutls_datum_t data;
gnutls_x509_crt_t server_crt, ca_crt2;
gnutls_x509_trust_list_t tl;
@@ -209,7 +210,10 @@ void doit(void)
gnutls_x509_crt_init(&server_crt);
gnutls_x509_crt_init(&ca_crt2);
- ret = gnutls_x509_trust_list_add_trust_dir(tl, "./x509cert-dir", NULL, GNUTLS_X509_FMT_PEM, 0, 0);
+ path = getenv("X509CERTDIR");
+ if (!path)
+ path = "./x509cert-dir";
+ ret = gnutls_x509_trust_list_add_trust_dir(tl, path, NULL, GNUTLS_X509_FMT_PEM, 0, 0);
if (ret != 1)
fail("gnutls_x509_trust_list_add_trust_dir: %d\n", ret);