diff options
| author | ruki <[email protected]> | 2020-03-17 23:14:42 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-17 13:28:12 +0800 |
| commit | 0924c3f19f63006333f05dbf83f6f152d8a1c920 (patch) | |
| tree | 566c6d179eea0b390dfb1a5ec61372d4e9714957 /tests | |
| parent | d6d0c6d91c030896f56bca97f8bf380b7b49c2ad (diff) | |
fix targetdeps for jobpool
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/projects/other/build_deps/xmake.lua | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/tests/projects/other/build_deps/xmake.lua b/tests/projects/other/build_deps/xmake.lua index 8b682a584..87918f7d7 100644 --- a/tests/projects/other/build_deps/xmake.lua +++ b/tests/projects/other/build_deps/xmake.lua @@ -8,14 +8,13 @@ target("dep1") os.rm(target:targetfile()) os.rm(target:dep("dep3"):targetfile()) end) - before_build(function (target) - assert(os.isfile(target:dep("dep3"):targetfile()), "dep1: before_build failed!") + before_link(function (target) + assert(os.isfile(target:dep("dep3"):targetfile()), "dep1: before_link failed!") end) - after_build(function (target) - assert(os.isfile(target:targetfile()), "dep1: after_build failed!") + after_link(function (target) + assert(os.isfile(target:targetfile()), "dep1: after_link failed!") end) - --[[ target("dep2") set_kind("static") add_deps("dep3") @@ -24,12 +23,12 @@ target("dep2") os.rm(target:targetfile()) os.rm(target:dep("dep3"):targetfile()) end) - before_build(function (target) - assert(os.isfile(target:dep("dep3"):targetfile()), "dep2: before_build failed!") + before_link(function (target) + assert(os.isfile(target:dep("dep3"):targetfile()), "dep2: before_link failed!") + end) + after_link(function (target) + assert(os.isfile(target:targetfile()), "dep2: after_link failed!") end) - after_build(function (target) - assert(os.isfile(target:targetfile()), "dep2: after_build failed!") - end)]] target("dep3") set_kind("static") @@ -37,11 +36,10 @@ target("dep3") on_load(function (target) os.rm(target:targetfile()) end) - after_build(function (target) - assert(os.isfile(target:targetfile()), "dep3: after_build failed!") + after_link(function (target) + assert(os.isfile(target:targetfile()), "dep3: after_link failed!") end) - --[[ target("test1") set_kind("binary") add_deps("dep1", "dep2") @@ -52,16 +50,15 @@ target("test1") os.rm(target:dep("dep2"):targetfile()) os.rm(target:dep("dep3"):targetfile()) end) - before_build(function (target) - assert(os.isfile(target:dep("dep1"):targetfile()), "test1: before_build failed!") - assert(os.isfile(target:dep("dep2"):targetfile()), "test1: before_build failed!") - assert(os.isfile(target:dep("dep3"):targetfile()), "test1: before_build failed!") + before_link(function (target) + assert(os.isfile(target:dep("dep1"):targetfile()), "test1: before_link failed!") + assert(os.isfile(target:dep("dep2"):targetfile()), "test1: before_link failed!") + assert(os.isfile(target:dep("dep3"):targetfile()), "test1: before_link failed!") + end) + after_link(function (target) + assert(os.isfile(target:targetfile()), "test1: after_link failed!") end) - after_build(function (target) - assert(os.isfile(target:targetfile()), "test1: after_build failed!") - end)]] - --[[ target("test2") set_kind("binary") add_deps("dep1") @@ -71,10 +68,10 @@ target("test2") os.rm(target:dep("dep1"):targetfile()) os.rm(target:dep("dep3"):targetfile()) end) - before_build(function (target) - assert(os.isfile(target:dep("dep1"):targetfile()), "test2: before_build failed!") - assert(os.isfile(target:dep("dep3"):targetfile()), "test2: before_build failed!") + before_link(function (target) + assert(os.isfile(target:dep("dep1"):targetfile()), "test2: before_link failed!") + assert(os.isfile(target:dep("dep3"):targetfile()), "test2: before_link failed!") + end) + after_link(function (target) + assert(os.isfile(target:targetfile()), "test2: after_link failed!") end) - after_build(function (target) - assert(os.isfile(target:targetfile()), "test2: after_build failed!") - end)]] |
