From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 19 Jun 2016 20:18:43 +0000 (+0300)
Subject: lib-dcrypt: Fixed running unit tests in build directory.
X-Git-Tag: 2.2.25.rc1~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a12763b80dca2ce7ccfbcfdf133caa728e9f26e3;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Fixed running unit tests in build directory.
---

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index ea75e0c1f9..c7618f0dc5 100644
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -52,9 +52,9 @@ LIBDOVECOT_TEST = \
 	$(MODULE_LIBS)
 
 test_crypto_LDADD = $(LIBDOVECOT_TEST)
-test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_MODULE_DIR=\"$(top_srcdir)/src/lib-dcrypt/.libs\"
+test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_MODULE_DIR=\".libs\" -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
 test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c
 
 test_stream_LDADD = $(LIBDOVECOT_TEST)
-test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_MODULE_DIR=\"$(top_srcdir)/src/lib-dcrypt/.libs\"
+test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_MODULE_DIR=\".libs\" -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
 test_stream_SOURCES = $(libdcrypt_la_SOURCES) test-stream.c
diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index 1058b30b7b..959f4cab03 100644
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -57,7 +57,7 @@ void test_static_v1_input(void)
 
 	test_begin("test_static_v1_input");
 
-	struct istream *is_1 = i_stream_create_file("sample-v1.asc", IO_BLOCK_SIZE);
+	struct istream *is_1 = i_stream_create_file(DCRYPT_SRC_DIR"/sample-v1.asc", IO_BLOCK_SIZE);
 	struct istream *is_2 = i_stream_create_base64_decoder(is_1);
 	i_stream_unref(&is_1);
 	struct istream *is_3 = i_stream_create_decrypt(is_2, test_v1_kp.priv);
@@ -91,7 +91,7 @@ void test_static_v2_input(void)
 	unsigned char hash_dgst[hash->digest_size];
 	hash->init(hash_ctx);
 
-	struct istream *is_1 = i_stream_create_file("sample-v2.asc", IO_BLOCK_SIZE);
+	struct istream *is_1 = i_stream_create_file(DCRYPT_SRC_DIR"/sample-v2.asc", IO_BLOCK_SIZE);
 	struct istream *is_2 = i_stream_create_base64_decoder(is_1);
 	i_stream_unref(&is_1);
 	struct istream *is_3 = i_stream_create_decrypt(is_2, test_v2_kp.priv);