Use rpath for test executable
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/b7113135 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/b7113135 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/b7113135 Branch: refs/heads/master Commit: b7113135617eed0c44b7d13d20bb6e1c4b0c6b54 Parents: c5e8d65 Author: Nick Wellnhofer <[email protected]> Authored: Wed Jul 6 17:38:34 2016 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Wed Jul 6 18:19:02 2016 +0200 ---------------------------------------------------------------------- common/charmonizer.c | 23 ++++++----------------- common/charmonizer.main | 23 ++++++----------------- devel/bin/appveyor-build.bat | 3 +++ 3 files changed, 15 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/b7113135/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/common/charmonizer.c b/common/charmonizer.c index c60f7d3..d99bbbf 100644 --- a/common/charmonizer.c +++ b/common/charmonizer.c @@ -9131,17 +9131,14 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_CFlags_add_library_path(link_flags, self->cfish_lib_dir); } chaz_CFlags_add_external_lib(link_flags, self->cfish_lib_name); - - rule = chaz_MakeFile_add_rule(self->makefile, "test", "$(TEST_LUCY_EXE)"); + chaz_CFlags_add_rpath(link_flags, "\"$$PWD\""); if (self->cfish_lib_dir) { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", ".", - self->cfish_lib_dir, NULL); - } - else { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", ".", - NULL); + chaz_CFlags_add_rpath(link_flags, self->cfish_lib_dir); } + rule = chaz_MakeFile_add_rule(self->makefile, "test", "$(TEST_LUCY_EXE)"); + chaz_MakeRule_add_command(rule, "$(TEST_LUCY_EXE)"); + if (chaz_CLI_defined(self->cli, "enable-coverage")) { rule = chaz_MakeFile_add_rule(self->makefile, "coverage", "$(TEST_LUCY_EXE)"); @@ -9149,15 +9146,7 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { "lcov" " --zerocounters" " --directory $(BASE_DIR)"); - if (self->cfish_lib_dir) { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", - ".", self->cfish_lib_dir, - NULL); - } - else { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", - ".", NULL); - } + chaz_MakeRule_add_command(rule, "$(TEST_LUCY_EXE)"); chaz_MakeRule_add_command(rule, "lcov" " --capture" http://git-wip-us.apache.org/repos/asf/lucy/blob/b7113135/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/common/charmonizer.main b/common/charmonizer.main index 1b676ce..15a2061 100644 --- a/common/charmonizer.main +++ b/common/charmonizer.main @@ -522,17 +522,14 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_CFlags_add_library_path(link_flags, self->cfish_lib_dir); } chaz_CFlags_add_external_lib(link_flags, self->cfish_lib_name); - - rule = chaz_MakeFile_add_rule(self->makefile, "test", "$(TEST_LUCY_EXE)"); + chaz_CFlags_add_rpath(link_flags, "\"$$PWD\""); if (self->cfish_lib_dir) { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", ".", - self->cfish_lib_dir, NULL); - } - else { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", ".", - NULL); + chaz_CFlags_add_rpath(link_flags, self->cfish_lib_dir); } + rule = chaz_MakeFile_add_rule(self->makefile, "test", "$(TEST_LUCY_EXE)"); + chaz_MakeRule_add_command(rule, "$(TEST_LUCY_EXE)"); + if (chaz_CLI_defined(self->cli, "enable-coverage")) { rule = chaz_MakeFile_add_rule(self->makefile, "coverage", "$(TEST_LUCY_EXE)"); @@ -540,15 +537,7 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { "lcov" " --zerocounters" " --directory $(BASE_DIR)"); - if (self->cfish_lib_dir) { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", - ".", self->cfish_lib_dir, - NULL); - } - else { - chaz_MakeRule_add_command_with_libpath(rule, "$(TEST_LUCY_EXE)", - ".", NULL); - } + chaz_MakeRule_add_command(rule, "$(TEST_LUCY_EXE)"); chaz_MakeRule_add_command(rule, "lcov" " --capture" http://git-wip-us.apache.org/repos/asf/lucy/blob/b7113135/devel/bin/appveyor-build.bat ---------------------------------------------------------------------- diff --git a/devel/bin/appveyor-build.bat b/devel/bin/appveyor-build.bat index a761c94..7620f38 100644 --- a/devel/bin/appveyor-build.bat +++ b/devel/bin/appveyor-build.bat @@ -23,6 +23,9 @@ exit /b 1 :test_c +rem Needed to find DLL. +path C:\install\bin;%path% + if "%MSVC_VERSION%" == "10" goto msvc_10 call "C:\Program Files (x86)\Microsoft Visual Studio %MSVC_VERSION%.0\VC\vcvarsall.bat" amd64
