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

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index ea75e0c1f9213ba03861e944e7a3dac1c679070b..c7618f0dc5c033d97faff6709bd9ca7a8099be66 100644 (file)
--- 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 1058b30b7baa7f5d9e495eab75765fa7d77d383b..959f4cab03412ab6f9f5780ef6ff834c0814d8f2 100644 (file)
--- 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);