summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorruki <[email protected]>2021-09-15 14:31:50 +0800
committerGitHub <[email protected]>2021-09-15 14:31:50 +0800
commitd773af81947a9f5a45912777abfbc1a5f0233f9b (patch)
treedef2ce373735522320a51be9cc8253464a26ea9f /tests
parent67c6212a9f7269f17f13f6bf10952c7b1c69d2c5 (diff)
parentebe9e105b9ddb55d928c647ce0d15da9bd19c5c5 (diff)
Merge pull request #1672 from xmake-io/load
Improve load deps
Diffstat (limited to 'tests')
-rw-r--r--tests/projects/other/build_deps/xmake.lua16
-rw-r--r--tests/projects/other/multiplats_vs/xmake.lua2
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/projects/other/build_deps/xmake.lua b/tests/projects/other/build_deps/xmake.lua
index 2458ba7df..9fe31c900 100644
--- a/tests/projects/other/build_deps/xmake.lua
+++ b/tests/projects/other/build_deps/xmake.lua
@@ -4,7 +4,7 @@ target("dep1")
set_kind("static")
add_deps("dep3")
add_files("src/interface.c")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
os.rm(target:dep("dep3"):targetfile())
end)
@@ -20,7 +20,7 @@ target("dep2")
set_kind("static")
add_deps("dep3")
add_files("src/interface.c")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
os.rm(target:dep("dep3"):targetfile())
end)
@@ -36,7 +36,7 @@ target("dep3")
set_kind("static")
add_files("src/interface.c")
add_deps("dep4", "dep5")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
os.rm(target:dep("dep4"):targetfile())
os.rm(target:dep("dep5"):targetfile())
@@ -51,7 +51,7 @@ target("dep3")
target("dep4")
set_kind("static")
add_files("src/interface.c")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
end)
after_link(function (target)
@@ -62,7 +62,7 @@ target("dep4")
target("dep5")
set_kind("static")
add_files("src/interface.c")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
end)
after_link(function (target)
@@ -74,7 +74,7 @@ target("test1")
set_kind("binary")
add_deps("dep1", "dep2")
add_files("src/test.c")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
os.rm(target:dep("dep1"):targetfile())
os.rm(target:dep("dep2"):targetfile())
@@ -94,7 +94,7 @@ target("test2")
set_kind("binary")
add_deps("dep1")
add_files("src/test.c")
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
os.rm(target:dep("dep1"):targetfile())
os.rm(target:dep("dep3"):targetfile())
@@ -120,7 +120,7 @@ target("test3")
add_rules("test3")
add_files("src/test.c")
set_policy("build.across_targets_in_parallel", false)
- on_load(function (target)
+ after_load(function (target)
os.rm(target:targetfile())
os.rm(target:dep("dep1"):targetfile())
os.rm(target:dep("dep3"):targetfile())
diff --git a/tests/projects/other/multiplats_vs/xmake.lua b/tests/projects/other/multiplats_vs/xmake.lua
index 4e61a20a1..255e2e913 100644
--- a/tests/projects/other/multiplats_vs/xmake.lua
+++ b/tests/projects/other/multiplats_vs/xmake.lua
@@ -1,7 +1,7 @@
add_rules("mode.debug", "mode.release")
rule("vs2015_x86")
- before_load(function (target)
+ on_load(function (target)
target:set("arch", "x86")
target:set("toolchains", "msvc", {vs = "2015"})
end)