diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | ini/ini.d/foo.conf.in (renamed from ini/ini.d/foo.conf) | 0 | ||||
| -rw-r--r-- | ini/ini_parse_ut.c | 16 |
4 files changed, 8 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 4b74b28..167bc1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -289,6 +289,7 @@ endif clean-local-ini_config: rm -f ./*.out rm -f test.ini + rm -f ./foo.conf #From ini_parse_ut ############################################################################## # Additional rules diff --git a/configure.ac b/configure.ac index 2e22e8a..eae028f 100644 --- a/configure.ac +++ b/configure.ac @@ -77,5 +77,6 @@ AC_CONFIG_FILES([Makefile contrib/ding-libs.spec refarray/ref_array.cfg.doxy refarray/ref_array.pc basicobjects/basicobjects.cfg.doxy basicobjects/basicobjects.pc - ini/ini_config.cfg.doxy ini/ini_config.pc]) + ini/ini_config.cfg.doxy ini/ini_config.pc + ini/ini.d/foo.conf]) AC_OUTPUT diff --git a/ini/ini.d/foo.conf b/ini/ini.d/foo.conf.in index 44d56a1..44d56a1 100644 --- a/ini/ini.d/foo.conf +++ b/ini/ini.d/foo.conf.in diff --git a/ini/ini_parse_ut.c b/ini/ini_parse_ut.c index 75a1145..6cab9d4 100644 --- a/ini/ini_parse_ut.c +++ b/ini/ini_parse_ut.c @@ -42,6 +42,8 @@ char *confdir = NULL; if (verbose) foo; \ } while(0) +#define FOO_CONF "./ini/ini.d/foo.conf" + typedef int (*test_fn)(void); int test_one_file(const char *in_filename, @@ -327,10 +329,8 @@ int merge_values_test(void) const char *resname = "./merge.conf.out"; const char *checkname = "./expect.conf.out"; char command[PATH_MAX * 3]; - char *srcdir; - srcdir = getenv("srcdir"); - sprintf(filename, "%s/ini/ini.d/foo.conf", (srcdir == NULL) ? "." : srcdir); + memcpy(filename, FOO_CONF, sizeof(FOO_CONF)); error = simplebuffer_alloc(&sbobj); if (error) { @@ -639,11 +639,8 @@ int startup_test(void) struct ini_cfgobj *ini_config = NULL; char **error_list = NULL; char filename[PATH_MAX]; - char *srcdir; - srcdir = getenv("srcdir"); - sprintf(filename, "%s/ini/ini.d/foo.conf", - (srcdir == NULL) ? "." : srcdir); + memcpy(filename, FOO_CONF, sizeof(FOO_CONF)); INIOUT(printf("<==== Startup test ====>\n")); @@ -746,15 +743,12 @@ int reload_test(void) char infile[PATH_MAX]; char outfile[PATH_MAX]; const char *command = "cp"; - char *srcdir; char *builddir; int changed = 0; INIOUT(printf("<==== Reload test ====>\n")); - srcdir = getenv("srcdir"); - sprintf(infile, "%s/ini/ini.d/foo.conf", - (srcdir == NULL) ? "." : srcdir); + memcpy(infile, FOO_CONF, sizeof(FOO_CONF)); builddir = getenv("builddir"); sprintf(outfile, "%s/foo.conf", (builddir == NULL) ? "." : builddir); |