From 767716edc1a2aa930dd142a42a2d664addf151c1 Mon Sep 17 00:00:00 2001 From: Alberto Sartori Date: Fri, 20 Oct 2023 17:43:45 +0200 Subject: just-serve: add end-to-end tests serve_target_remote_build.sh should be updated once just-serve can orchestrate the remote build --- test/end-to-end/TARGETS | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'test/end-to-end/TARGETS') diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS index 4ec2fe5d..ef7242b2 100644 --- a/test/end-to-end/TARGETS +++ b/test/end-to-end/TARGETS @@ -50,22 +50,32 @@ } , "TESTS": { "type": "install" + , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] , "tainted": ["test"] , "dirs": - [ [["./", "actions", "TESTS"], "actions"] - , [["./", "cli", "TESTS"], "cli"] - , [["./", "generated-binary", "TESTS"], "generated-binary"] - , [["./", "target-tests", "TESTS"], "targets"] - , [["./", "user-errors", "TESTS"], "user-errors"] - , [["./", "built-in-rules", "TESTS"], "built-in-rules"] - , [["./", "build-fails", "TESTS"], "build-fails"] - , [["./", "remote-execution", "TESTS"], "remote-execution"] - , [["./", "target-cache", "TESTS"], "target-cache"] - , [["./", "just-mr", "TESTS"], "just-mr"] - , [["./", "git-import", "TESTS"], "git-import"] - , [["./", "gc", "TESTS"], "gc"] - , [["./", "execution-service", "TESTS"], "execution-service"] - , [["./", "symlinks", "TESTS"], "symlinks"] - ] + { "type": "++" + , "$1": + [ [ [["./", "actions", "TESTS"], "actions"] + , [["./", "cli", "TESTS"], "cli"] + , [["./", "generated-binary", "TESTS"], "generated-binary"] + , [["./", "target-tests", "TESTS"], "targets"] + , [["./", "user-errors", "TESTS"], "user-errors"] + , [["./", "built-in-rules", "TESTS"], "built-in-rules"] + , [["./", "build-fails", "TESTS"], "build-fails"] + , [["./", "remote-execution", "TESTS"], "remote-execution"] + , [["./", "target-cache", "TESTS"], "target-cache"] + , [["./", "just-mr", "TESTS"], "just-mr"] + , [["./", "git-import", "TESTS"], "git-import"] + , [["./", "gc", "TESTS"], "gc"] + , [["./", "execution-service", "TESTS"], "execution-service"] + , [["./", "symlinks", "TESTS"], "symlinks"] + ] + , { "type": "if" + , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} + , "then": [] + , "else": [[["./", "serve-service", "TESTS"], "serve-service"]] + } + ] + } } } -- cgit v1.2.3