summaryrefslogtreecommitdiff
path: root/tests/actions/addon/projects
diff options
context:
space:
mode:
Diffstat (limited to 'tests/actions/addon/projects')
-rw-r--r--tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua2
-rw-r--r--tests/actions/addon/projects/autofetch-badinclude/xmake.lua2
-rw-r--r--tests/actions/addon/projects/autofetch-badname/xmake-addons.lua2
-rw-r--r--tests/actions/addon/projects/autofetch-badname/xmake.lua3
-rw-r--r--tests/actions/addon/projects/autofetch-build/xmake-addons.lua2
-rw-r--r--tests/actions/addon/projects/autofetch-build/xmake.lua3
-rw-r--r--tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua1
-rw-r--r--tests/actions/addon/projects/autofetch-lockmiss/xmake.lua2
-rw-r--r--tests/actions/addon/projects/autofetch/xmake-addons.lua1
-rw-r--r--tests/actions/addon/projects/autofetch/xmake.lua3
10 files changed, 11 insertions, 10 deletions
diff --git a/tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua b/tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua
deleted file mode 100644
index 6931855ae..000000000
--- a/tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- this file only declares the addons, it cannot reference them
-includes("@addon/custom-include/check")
diff --git a/tests/actions/addon/projects/autofetch-badinclude/xmake.lua b/tests/actions/addon/projects/autofetch-badinclude/xmake.lua
deleted file mode 100644
index 0d94cf61c..000000000
--- a/tests/actions/addon/projects/autofetch-badinclude/xmake.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-target("test")
- set_kind("phony")
diff --git a/tests/actions/addon/projects/autofetch-badname/xmake-addons.lua b/tests/actions/addon/projects/autofetch-badname/xmake-addons.lua
deleted file mode 100644
index 165325fb7..000000000
--- a/tests/actions/addon/projects/autofetch-badname/xmake-addons.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- the `addon` name is reserved for the addon references
-add_addons("addon")
diff --git a/tests/actions/addon/projects/autofetch-badname/xmake.lua b/tests/actions/addon/projects/autofetch-badname/xmake.lua
index 0d94cf61c..ffbf6cbe4 100644
--- a/tests/actions/addon/projects/autofetch-badname/xmake.lua
+++ b/tests/actions/addon/projects/autofetch-badname/xmake.lua
@@ -1,2 +1,5 @@
+-- the `addon` name is reserved for the addon references
+add_addons("addon")
+
target("test")
set_kind("phony")
diff --git a/tests/actions/addon/projects/autofetch-build/xmake-addons.lua b/tests/actions/addon/projects/autofetch-build/xmake-addons.lua
deleted file mode 100644
index 2091e3b7f..000000000
--- a/tests/actions/addon/projects/autofetch-build/xmake-addons.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- the addons which this project needs, they are installed automatically when we load it
-add_addons("custom-include", "custom-rule", "custom-toolchain")
diff --git a/tests/actions/addon/projects/autofetch-build/xmake.lua b/tests/actions/addon/projects/autofetch-build/xmake.lua
index bad3f8928..862ddf676 100644
--- a/tests/actions/addon/projects/autofetch-build/xmake.lua
+++ b/tests/actions/addon/projects/autofetch-build/xmake.lua
@@ -1,3 +1,6 @@
+-- the addons which this project needs, they are installed automatically
+add_addons("custom-include", "custom-rule", "custom-toolchain")
+
-- the option comes from the includes file of an addon
includes("@addon/custom-include/check")
diff --git a/tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua b/tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua
deleted file mode 100644
index a85e0fe11..000000000
--- a/tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua
+++ /dev/null
@@ -1 +0,0 @@
-add_addons("custom-include")
diff --git a/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua b/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua
index 0d94cf61c..a96a4e713 100644
--- a/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua
+++ b/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua
@@ -1,2 +1,4 @@
+add_addons("custom-include")
+
target("test")
set_kind("phony")
diff --git a/tests/actions/addon/projects/autofetch/xmake-addons.lua b/tests/actions/addon/projects/autofetch/xmake-addons.lua
deleted file mode 100644
index a85e0fe11..000000000
--- a/tests/actions/addon/projects/autofetch/xmake-addons.lua
+++ /dev/null
@@ -1 +0,0 @@
-add_addons("custom-include")
diff --git a/tests/actions/addon/projects/autofetch/xmake.lua b/tests/actions/addon/projects/autofetch/xmake.lua
index 4eaca0785..75c909904 100644
--- a/tests/actions/addon/projects/autofetch/xmake.lua
+++ b/tests/actions/addon/projects/autofetch/xmake.lua
@@ -1,3 +1,6 @@
+-- the addons which this project needs, they are installed automatically
+add_addons("custom-include")
+
-- the addon is installed automatically, so we can use its includes file here
includes("@addon/custom-include/check")