lib-lua: Add missing lua scripts location

without this make check fails when the build dir is different than the source dir

diff --git a/src/lib-lua/Makefile.am b/src/lib-lua/Makefile.am
index 0e8a011ca9e520e103342f90338094eded614f76..f6c44e09a992c7e913a6162771fc935620d4be5f 100644 (file)
--- a/src/lib-lua/Makefile.am
+++ b/src/lib-lua/Makefile.am
@@ -71,10 +71,10 @@ noinst_PROGRAMS = $(test_programs)
 test_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la
 
 test_lua_SOURCES = test-lua.c
-test_lua_CFLAGS = $(AM_CFLAGS) $(BINARY_CFLAGS)
-test_lua_LDFLAGS = $(BINARY_LDFLAGS)
 test_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
 test_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
+test_lua_CFLAGS = $(AM_CFLAGS) \
+       -DTEST_LUA_SCRIPT_DIR=\"$(abs_srcdir)\"
 
 test_dict_lua_SOURCES = test-dict-lua.c
 test_dict_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
@@ -87,14 +87,14 @@ test_dns_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
 test_io_lua_SOURCES = test-io-lua.c
 test_io_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
 test_io_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
+test_io_lua_CFLAGS = $(AM_CFLAGS) \
+       -DTEST_LUA_SCRIPT_DIR=\"$(abs_srcdir)\"
 
 test_lua_http_client_SOURCES = test-lua-http-client.c
 test_lua_http_client_LDADD = libdlua.la $(LIBDOVECOT) $(test_libs_ssl) $(LUA_LIBS)
 test_lua_http_client_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
-test_lua_http_client_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DOVECOT_BINARY_CFLAGS) \
-       -DTEST_LUA_SCRIPT_DIR=\"$(abs_top_srcdir)/src/lib-lua\"
+test_lua_http_client_CFLAGS = $(AM_CFLAGS) \
+       -DTEST_LUA_SCRIPT_DIR=\"$(abs_srcdir)\"
 
 check-local:
        for bin in $(test_programs); do \

diff --git a/src/lib-lua/test-io-lua.c b/src/lib-lua/test-io-lua.c
index 88580f7817b430ea2025c7903405b364e45dfa16..69be431769ae54f9dd924a77b4ddf00ab745719e 100644 (file)
--- a/src/lib-lua/test-io-lua.c
+++ b/src/lib-lua/test-io-lua.c
@@ -36,7 +36,8 @@ static void test_io_lua(void)
        struct dlua_script *script;
        const char *error;
 
-       if (dlua_script_create_file("test-io-lua.lua", &script, NULL, &error) < 0)
+       if (dlua_script_create_file(TEST_LUA_SCRIPT_DIR "/test-io-lua.lua",
+                                   &script, NULL, &error) < 0)
                i_fatal("%s", error);
 
        dlua_dovecot_register(script);

diff --git a/src/lib-lua/test-lua.c b/src/lib-lua/test-lua.c
index af350dc5b96119666a7c64acbb7e4b3452e8174a..38d2c327912fe3171f51630f07d9ecefbb56aed1 100644 (file)
--- a/src/lib-lua/test-lua.c
+++ b/src/lib-lua/test-lua.c
@@ -523,7 +523,8 @@ static void test_lua_base64(void)
        struct dlua_script *script;
        const char *error;
 
-       if (dlua_script_create_file("test-lua-base64.lua", &script, NULL, &error) < 0)
+       if (dlua_script_create_file(TEST_LUA_SCRIPT_DIR "/test-lua-base64.lua",
+                                   &script, NULL, &error) < 0)
                i_fatal("%s", error);
 
        dlua_dovecot_register(script);