From e92a8ab021672b19e5cd397fa555fcc8a3401e8b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 10 Sep 2015 18:11:58 +0200 Subject: g10: Fix make distcheck problem. * g10/test.c: Include string.h. (prepend_srcdir): New. Taken from Libgcrypt. (test_free): New. * g10/t-keydb.c (do_test): Malloc the filename. * g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR (EXTRA_DIST): Add t-keydb-keyring.kbx. -- Using SOURCE_DIR should in general work but we have seen problems when doing this in Libgcrypt. Using the srcdir variable gives us anyway more flexibility and aligns with the way we do it in tests/openpgp. Signed-off-by: Werner Koch --- g10/t-keydb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'g10/t-keydb.c') diff --git a/g10/t-keydb.c b/g10/t-keydb.c index 634cb05a7..17a76111d 100644 --- a/g10/t-keydb.c +++ b/g10/t-keydb.c @@ -30,11 +30,14 @@ do_test (int argc, char *argv[]) KBNODE kb1, kb2; char *uid1; char *uid2; + char *fname; (void) argc; (void) argv; - rc = keydb_add_resource (SOURCE_DIR "/t-keydb-keyring.kbx", 0); + fname = prepend_srcdir ("t-keydb-keyring.kbx"); + rc = keydb_add_resource (fname, 0); + test_free (fname); if (rc) ABORT ("Failed to open keyring."); -- cgit v1.2.3