From b56a02602ab8bc1b06b2b10c9b1a14b1b189b20e Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Fri, 19 Jan 2018 01:28:40 -0300 Subject: [PATCH] mono: Fix AM_TESTS_ENVIRONMENT The export commands were messing up with the elm_suite, causing the layout do fail to be loaded. --- src/Makefile_Efl_Mono.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am index 7cfa20d4da..af85ab853b 100644 --- a/src/Makefile_Efl_Mono.am +++ b/src/Makefile_Efl_Mono.am @@ -372,14 +372,14 @@ tests/efl_mono/efl_mono$(EXEEXT).config: echo "" >> $@ # C Sharp test executable -AM_TESTS_ENVIRONMENT += MONO='mono'; export MONO; -AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)'; export MONO_BUILDPATH; -AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)'; export MONO_PATH; -AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT; +AM_TESTS_ENVIRONMENT += MONO='mono' +AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)' +AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)' +AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)' if HAVE_WIN32 -AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)'; export PATH; +AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)' else -AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)'; export LD_LIBRARY_PATH; +AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)' check_PROGRAMS += tests/efl_mono/efl_mono TESTS += tests/efl_mono/mono_test_driver.sh