From c1c30cc6ce435021084f30567fa6ec9cd939e0b5 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Mon, 23 Jan 2017 16:13:15 +0100 Subject: [PATCH] eolian tests: pass in generator path externally --- src/Makefile_Eolian.am | 1 + src/tests/eolian/eolian_generation.c | 15 ++------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am index 92df3ed689..1a85c15118 100644 --- a/src/Makefile_Eolian.am +++ b/src/Makefile_Eolian.am @@ -119,6 +119,7 @@ tests_eolian_eolian_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_build -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian\" \ -DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/eolian\" \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ +-DEOLIAN_GEN="\"$(EOLIAN_GEN)\"" \ @CHECK_CFLAGS@ \ @EOLIAN_CFLAGS@ @EO_CFLAGS@ TESTS += tests/eolian/eolian_suite diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c index 0607269305..fe4e55121e 100644 --- a/src/tests/eolian/eolian_generation.c +++ b/src/tests/eolian/eolian_generation.c @@ -83,21 +83,10 @@ _remove_ref(const char *base, const char *ext) static int _eolian_gen_execute(const char *eo_filename, const char *options, const char *output_filename) { - char eolian_gen_path[PATH_MAX] = ""; char command[PATH_MAX]; - - if (getenv("EFL_RUN_IN_TREE")) - { - snprintf(eolian_gen_path, sizeof(eolian_gen_path), - "%s/src/bin/eolian/eolian_gen%s", - PACKAGE_BUILD_DIR, EXEEXT); - } - if (eolian_gen_path[0] == '\0') - return -1; - snprintf(command, PATH_MAX, - "%s %s -I \""PACKAGE_DATA_DIR"/data\" -o %s %s", - eolian_gen_path, options, output_filename, eo_filename); + EOLIAN_GEN" %s -I \""PACKAGE_DATA_DIR"/data\" -o %s %s", + options, output_filename, eo_filename); return system(command); }