Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testsuite: fix in-tree LUA_PATH to find correct fluxometer during tests #2404

Merged
merged 2 commits into from Sep 28, 2019

Conversation

@grondo
Copy link
Contributor

commented Sep 27, 2019

The late breaking news is that the current directory is not always first in your LUA_PATH.

This PR fixes a couple spots where the converse was assumed.

grondo added 2 commits Sep 27, 2019
Problem: on some Lua 5.2 systems, the current directory is
last in the default LUA_PATH instead of first. This could result in
flux Lua tests picking up the installed version of the test
driver `fluxometer.lua` instead of the in-tree version.

For in-tree flux(1), add the *explicit* path to fluxometer.lua,
"$(top_builddir)/t/?.lua", to the "lua_path_add" libflux conf
setting, to better ensure the right fluxometer is found in
tests.

Fixes #2403
Problem: on some systems `./?.lua` (the currend dir) is not always
first in the default LUA_PATH. The lua-based tests in the testsuite
depend on having this directory first in the path to ensure the
correct fluxometer.lua is found during `make check`.

Instead of assuming that the default empty LUA_PATH will work
correctly, _always_ prepend "$(buiddir)/t/?.lua" to LUA_PATH in the
testuite Makefile.am, to ensure that an incorrect system installed
fluxometer.lua is not found during testing.
@grondo grondo force-pushed the grondo:intree-lua-path branch from 7443154 to 6d068f6 Sep 27, 2019
@codecov-io

This comment has been minimized.

Copy link

commented Sep 27, 2019

Codecov Report

Merging #2404 into master will increase coverage by 0.03%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2404      +/-   ##
==========================================
+ Coverage   81.08%   81.11%   +0.03%     
==========================================
  Files         224      224              
  Lines       35770    35770              
==========================================
+ Hits        29004    29015      +11     
+ Misses       6766     6755      -11
Impacted Files Coverage Δ
src/common/libflux/message.c 80.22% <0%> (-0.14%) ⬇️
src/cmd/flux-module.c 84.19% <0%> (+0.23%) ⬆️
src/modules/connector-local/local.c 74.27% <0%> (+1.16%) ⬆️
src/common/libflux/mrpc.c 88.97% <0%> (+1.18%) ⬆️
@chu11

This comment has been minimized.

Copy link
Contributor

commented Sep 28, 2019

LGTM! - just set merge-when-passing, assuming it's ready.

@chu11
chu11 approved these changes Sep 28, 2019
@garlick

This comment has been minimized.

Copy link
Member

commented Sep 28, 2019

I confirmed this fixes #2403 on my system where it was originally a problem. Thanks!

@garlick garlick merged commit 373cc77 into flux-framework:master Sep 28, 2019
4 checks passed
4 checks passed
Summary 1 potential rule
Details
codecov/patch Coverage not affected when comparing 62535cd...6d068f6
Details
codecov/project 81.11% (+0.03%) compared to 62535cd
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@garlick garlick referenced this pull request Sep 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.