From e529726e501154b34cefb2532b0e517d33221bf1 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Fri, 15 May 2015 22:30:48 +0200 Subject: [PATCH] Fix "make distcheck" --- tests/Makefile.am | 2 +- tests/check_cfg.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index fb064a7..17958fd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS = @EZ_CPPFLAGS@ \ -I$(top_srcdir)/compat \ -I$(top_srcdir)/src \ -I$(top_builddir)/src -AM_CFLAGS = @EZ_CFLAGS@ @CHECK_CFLAGS@ +AM_CFLAGS = @EZ_CFLAGS@ @CHECK_CFLAGS@ -DSRCDIR="\"$(srcdir)\"" AM_LDFLAGS = @EZ_LDFLAGS@ EXTRA_DIST = \ diff --git a/tests/check_cfg.c b/tests/check_cfg.c index 103fdaf..8703074 100644 --- a/tests/check_cfg.c +++ b/tests/check_cfg.c @@ -99,21 +99,21 @@ Suite * cfg_suite(void); START_TEST(test_reload) { - ck_assert_int_eq(cfg_set_program_config_file("config-ok.xml", NULL), - 0); + ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-ok.xml", + NULL), 0); ck_assert_int_eq(cfg_reload(), 0); ck_assert_int_eq(cfg_reload(), 0); - ck_assert_int_eq(cfg_set_program_config_file("config-bad.xml", NULL), - 0); + ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad.xml", + NULL), 0); ck_assert_int_eq(cfg_reload(), -1); - ck_assert_int_eq(cfg_set_program_config_file("config-bad2.xml", NULL), - 0); + ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad2.xml", + NULL), 0); ck_assert_int_eq(cfg_reload(), -1); - ck_assert_int_eq(cfg_set_program_config_file("config-bad3.xml", NULL), - 0); + ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad3.xml", + NULL), 0); ck_assert_int_eq(cfg_reload(), -1); - ck_assert_int_eq(cfg_set_program_config_file("config-bad4.xml", NULL), - 0); + ck_assert_int_eq(cfg_set_program_config_file(SRCDIR "/config-bad4.xml", + NULL), 0); ck_assert_int_eq(cfg_reload(), -1); } END_TEST @@ -147,7 +147,7 @@ END_TEST START_TEST(test_file_check) { ck_assert_int_eq(cfg_file_check(NULL), -1); - ck_assert_int_eq(cfg_file_check("check_cfg.c"), 0); + ck_assert_int_eq(cfg_file_check(SRCDIR "/check_cfg.c"), 0); } END_TEST