gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/lua-5: fix checkPropogatedBuildInputs test; cleanup naming; cleanup lint messages (#390140)

Browse Source
This commit is contained in:
Austin Horstman
2025-03-16 21:42:09 -05:00
committed by GitHub
parent 8490862820 25e5402a49
commit da8f90bae0
1 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/lua-5/tests/default.nix
+29 -37
View File
@@ -10,10 +10,10 @@ let
lua:
{ name, command }:
pkgs.runCommandLocal "test-${lua.name}-${name}"
({
{
nativeBuildInputs = [ lua ];
meta.platforms = lua.meta.platforms;
})
}
(
''
source ${./assert.sh}
@@ -58,9 +58,9 @@ let
";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;";
};
in
pkgs.recurseIntoAttrs ({
pkgs.recurseIntoAttrs {
checkInterpreterPatch =
checkInterpreterPath =
let
golden_LUA_PATH = golden_LUA_PATHS.${lib.versions.majorMinor lua.version};
in
@@ -73,14 +73,10 @@ pkgs.recurseIntoAttrs ({
'';
};
checkWrapping =
pkgs.runCommandLocal "test-${lua.name}-wrapping"
({
})
(''
grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello
touch $out
'');
checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" { } ''
grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello
touch $out
'';
# checks that lua's setup-hook adds dependencies to LUA_PATH
# Prevents the following regressions
@@ -90,45 +86,41 @@ pkgs.recurseIntoAttrs ({
# stdin:1: module 'http.request' not found:
checkSetupHook =
pkgs.runCommandLocal "test-${lua.name}-setup-hook"
({
{
nativeBuildInputs = [ lua ];
buildInputs = [ lua.pkgs.http ];
meta.platforms = lua.meta.platforms;
})
(''
}
''
${lua}/bin/lua -e "require'http.request'"
touch $out
'');
'';
checkRelativeImports =
pkgs.runCommandLocal "test-${lua.name}-relative-imports"
({
})
(''
source ${./assert.sh}
checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" { } ''
source ${./assert.sh}
lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"
lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"
lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"
lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"
assertStringContains "$lua_vanilla_package_path" "./?.lua"
assertStringContains "$lua_vanilla_package_path" "./?/init.lua"
assertStringContains "$lua_vanilla_package_path" "./?.lua"
assertStringContains "$lua_vanilla_package_path" "./?/init.lua"
assertStringContains "$lua_with_module_package_path" "./?.lua"
assertStringContains "$lua_with_module_package_path" "./?/init.lua"
assertStringContains "$lua_with_module_package_path" "./?.lua"
assertStringContains "$lua_with_module_package_path" "./?/init.lua"
touch $out
'');
touch $out
'';
# Check that a lua package's propagatedBuildInputs end up in LUA_PATH
checkPropagatedBuildInputs =
pkgs.runCommandLocal "test-${lua.name}-setup-hook"
({
# lua-curl is a propagatedBuildInput of rest-nvim has
{
buildInputs = [ lua.pkgs.rest-nvim ];
})
(''
${lua}/bin/lua -e "require'cURL'"
}
# `xml2lua` is a propagatedBuildInput of rest-nvim
''
${lua}/bin/lua -e "require'xml2lua'"
touch $out
'');
'';
})
}