awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Lua executable envvar 

Use `LUA` based on the traditional naming scheme in Makefiles.
This commit is contained in:
Lucas Schwiderski 2021-03-08 16:25:54 +01:00
parent d9640cf027
commit 4d43ccda6d
No known key found for this signature in database
GPG Key ID: AA12679AAA6DF4D8
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -412,14 +412,14 @@ if ("${TEST_MANUAL_SCREENS}" MATCHES "1")
endif() endif()
add_custom_target(check-integration add_custom_target(check-integration
${CMAKE_COMMAND} -E env CMAKE_BINARY_DIR='${CMAKE_BINARY_DIR}' LUA_EXECUTABLE='${LUA_EXECUTABLE}' ${TESTS_RUN_ENV} ./tests/run.sh \$\${TEST_RUN_ARGS:--W} ${CMAKE_COMMAND} -E env CMAKE_BINARY_DIR='${CMAKE_BINARY_DIR}' LUA='${LUA_EXECUTABLE}' ${TESTS_RUN_ENV} ./tests/run.sh \$\${TEST_RUN_ARGS:--W}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "Running integration tests" COMMENT "Running integration tests"
DEPENDS ${PROJECT_AWE_NAME} DEPENDS ${PROJECT_AWE_NAME}
USES_TERMINAL) USES_TERMINAL)
add_dependencies(check-integration test-gravity) add_dependencies(check-integration test-gravity)
add_custom_target(check-themes add_custom_target(check-themes
${CMAKE_COMMAND} -E env CMAKE_BINARY_DIR='${CMAKE_BINARY_DIR}' LUA_EXECUTABLE='${LUA_EXECUTABLE}' ${TESTS_RUN_ENV} ./tests/themes/run.sh ${CMAKE_COMMAND} -E env CMAKE_BINARY_DIR='${CMAKE_BINARY_DIR}' LUA='${LUA_EXECUTABLE}' ${TESTS_RUN_ENV} ./tests/themes/run.sh
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMENT "Testing themes" COMMENT "Testing themes"
USES_TERMINAL USES_TERMINAL

2
tests/_client.lua
View File

@ -1,6 +1,6 @@
local spawn = require("awful.spawn") local spawn = require("awful.spawn")
local lua_executable = os.getenv("LUA_EXECUTABLE") local lua_executable = os.getenv("LUA")
if lua_executable == nil or lua_executable == "" then if lua_executable == nil or lua_executable == "" then
lua_executable = "lua" lua_executable = "lua"
end end

2
tests/test-selection-getter.lua
View File

@ -8,7 +8,7 @@ local lgi = require("lgi")
local Gio = lgi.Gio local Gio = lgi.Gio
local GdkPixbuf = lgi.GdkPixbuf local GdkPixbuf = lgi.GdkPixbuf
local lua_executable = os.getenv("LUA_EXECUTABLE") local lua_executable = os.getenv("LUA")
if lua_executable == nil or lua_executable == "" then if lua_executable == nil or lua_executable == "" then
lua_executable = "lua" lua_executable = "lua"
end end

2
tests/test-selection-transfer.lua
View File

@ -3,7 +3,7 @@
local runner = require("_runner") local runner = require("_runner")
local spawn = require("awful.spawn") local spawn = require("awful.spawn")
local lua_executable = os.getenv("LUA_EXECUTABLE") local lua_executable = os.getenv("LUA")
if lua_executable == nil or lua_executable == "" then if lua_executable == nil or lua_executable == "" then
lua_executable = "lua" lua_executable = "lua"
end end

2
tests/test-selection-watcher.lua
View File

@ -3,7 +3,7 @@
local runner = require("_runner") local runner = require("_runner")
local spawn = require("awful.spawn") local spawn = require("awful.spawn")
local lua_executable = os.getenv("LUA_EXECUTABLE") local lua_executable = os.getenv("LUA")
if lua_executable == nil or lua_executable == "" then if lua_executable == nil or lua_executable == "" then
lua_executable = "lua" lua_executable = "lua"
end end

2
tests/test-spawn.lua
View File

@ -3,7 +3,7 @@
local runner = require("_runner") local runner = require("_runner")
local spawn = require("awful.spawn") local spawn = require("awful.spawn")
local lua_executable = os.getenv("LUA_EXECUTABLE") local lua_executable = os.getenv("LUA")
if lua_executable == nil or lua_executable == "" then if lua_executable == nil or lua_executable == "" then
lua_executable = "lua" lua_executable = "lua"
end end

2
tests/test-titlebar.lua
View File

@ -4,7 +4,7 @@ local rules = require("ruled.client")
local spawn = require("awful.spawn") local spawn = require("awful.spawn")
local gdebug = require("gears.debug") local gdebug = require("gears.debug")
local lua_executable = os.getenv("LUA_EXECUTABLE") local lua_executable = os.getenv("LUA")
if lua_executable == nil or lua_executable == "" then if lua_executable == nil or lua_executable == "" then
lua_executable = "lua" lua_executable = "lua"
end end