diff options
author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-03-03 11:00:55 +0100 |
---|---|---|
committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-03-03 13:09:05 +0100 |
commit | f49983aa96ac2403f3cd5cd3f49994fb6b86d466 (patch) | |
tree | 4ee7681ba4aa34f8e56487ef4ed07850dcb5348b | |
parent | db590c36fea80d51b0751b9d3929b469813b0df1 (diff) | |
download | justbuild-f49983aa96ac2403f3cd5cd3f49994fb6b86d466.tar.gz |
prune bootstrap sources
Originally, it was a good idea to add the full "bin" directory to
the bootstrap sources; all scripts there where used in some form
or another during bootstap and by taking the whole directory, we
wouldn't have to update the target when adding new scripts.
However, times have changed. The set of scripts neede for bootstrapping
is stable for quite a while now; on the other hand actively-developped
tools (like just-lock and just-import-git) now reside in "bin".
So, to avoid unnecessary runs of the bootstrap tests, prune the
dependency set.
While there, also mark as tainted.
-rw-r--r-- | TARGETS | 13 | ||||
-rw-r--r-- | test/bootstrap/TARGETS | 1 | ||||
-rw-r--r-- | test/end-to-end/target-cache/TARGETS | 5 |
3 files changed, 15 insertions, 4 deletions
@@ -285,13 +285,20 @@ } , "bootstrap-src": { "type": "install" - , "files": {"ROOT": "ROOT", "TARGETS": "TARGETS"} + , "tainted": ["test"] , "dirs": - [ [["TREE", null, "bin"], "."] - , [["TREE", null, "rules"], "."] + [ [["TREE", null, "rules"], "."] , [["TREE", null, "etc"], "."] , [["TREE", null, "src/buildtool"], "."] , [["TREE", null, "src/utils"], "."] ] + , "deps": + [ "ROOT" + , "TARGETS" + , "bin/bootstrap-traverser.py" + , "bin/bootstrap.py" + , "bin/just-mr.py" + , "bin/parallel-bootstrap-traverser.py" + ] } } diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index 690b20e9..6910a7ed 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -77,6 +77,7 @@ } , "staged-sources": { "type": "install" + , "tainted": ["test"] , "dirs": [[["@", "src", "", "bootstrap-src"], "srcs/just"]] } , "pkgconfig-test": diff --git a/test/end-to-end/target-cache/TARGETS b/test/end-to-end/target-cache/TARGETS index 43b8f76d..bc24070c 100644 --- a/test/end-to-end/target-cache/TARGETS +++ b/test/end-to-end/target-cache/TARGETS @@ -35,7 +35,10 @@ , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "bootstrap-src-staged": - {"type": "install", "dirs": [[["@", "src", "", "bootstrap-src"], "src"]]} + { "type": "install" + , "tainted": ["test"] + , "dirs": [[["@", "src", "", "bootstrap-src"], "src"]] + } , "check-sharding": { "type": ["@", "rules", "shell/test", "script"] , "name": ["check-sharding"] |