From 4d43ccda6d459819eb98b78db00e878ffd5fd36a Mon Sep 17 00:00:00 2001
From: Lucas Schwiderski <lucas@lschwiderski.de>
Date: Mon, 8 Mar 2021 16:25:54 +0100
Subject: [PATCH] Rename Lua executable envvar

Use `LUA` based on the traditional naming scheme in Makefiles.
---
 CMakeLists.txt                    | 4 ++--
 tests/_client.lua                 | 2 +-
 tests/test-selection-getter.lua   | 2 +-
 tests/test-selection-transfer.lua | 2 +-
 tests/test-selection-watcher.lua  | 2 +-
 tests/test-spawn.lua              | 2 +-
 tests/test-titlebar.lua           | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30854a322..0f8b06686 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,14 +412,14 @@ if ("${TEST_MANUAL_SCREENS}" MATCHES "1")
 endif()
 
 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}
     COMMENT "Running integration tests"
     DEPENDS ${PROJECT_AWE_NAME}
     USES_TERMINAL)
 add_dependencies(check-integration test-gravity)
 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}
     COMMENT "Testing themes"
     USES_TERMINAL
diff --git a/tests/_client.lua b/tests/_client.lua
index d9db30ab1..d86d9d252 100644
--- a/tests/_client.lua
+++ b/tests/_client.lua
@@ -1,6 +1,6 @@
 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
     lua_executable = "lua"
 end
diff --git a/tests/test-selection-getter.lua b/tests/test-selection-getter.lua
index 6e37b79e6..9d9193556 100644
--- a/tests/test-selection-getter.lua
+++ b/tests/test-selection-getter.lua
@@ -8,7 +8,7 @@ local lgi = require("lgi")
 local Gio = lgi.Gio
 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
     lua_executable = "lua"
 end
diff --git a/tests/test-selection-transfer.lua b/tests/test-selection-transfer.lua
index a1d0b4b42..52f1df919 100644
--- a/tests/test-selection-transfer.lua
+++ b/tests/test-selection-transfer.lua
@@ -3,7 +3,7 @@
 local runner = require("_runner")
 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
     lua_executable = "lua"
 end
diff --git a/tests/test-selection-watcher.lua b/tests/test-selection-watcher.lua
index b781a118c..3721a67f8 100644
--- a/tests/test-selection-watcher.lua
+++ b/tests/test-selection-watcher.lua
@@ -3,7 +3,7 @@
 local runner = require("_runner")
 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
     lua_executable = "lua"
 end
diff --git a/tests/test-spawn.lua b/tests/test-spawn.lua
index f58f03909..6bcf3faf7 100644
--- a/tests/test-spawn.lua
+++ b/tests/test-spawn.lua
@@ -3,7 +3,7 @@
 local runner = require("_runner")
 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
     lua_executable = "lua"
 end
diff --git a/tests/test-titlebar.lua b/tests/test-titlebar.lua
index 79c441b52..d80f19371 100644
--- a/tests/test-titlebar.lua
+++ b/tests/test-titlebar.lua
@@ -4,7 +4,7 @@ local rules = require("ruled.client")
 local spawn = require("awful.spawn")
 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
     lua_executable = "lua"
 end