From 6a983868200f147fb3b0d95ac07dd3855b1ba601 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 30 Nov 2022 14:57:47 +0100 Subject: [PATCH] testing/external: Bump cluster testsuite ...also add/propose aliases for sync-commits / sync-repos, because I could not remember for the past 5 times or so in which direction they would sync and would find myself reading the README, Makefile, or comments in the scripts. --- testing/external/Makefile | 4 ++-- testing/external/README | 6 +++--- testing/external/commit-hash.zeek-testing-cluster | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/external/Makefile b/testing/external/Makefile index 78d28ffbd2..5733bc7db0 100644 --- a/testing/external/Makefile +++ b/testing/external/Makefile @@ -30,10 +30,10 @@ coverage: update-timing: @for repo in $(REPOS); do ( cd $$repo && echo "Updating timing for '$$repo' repo:" && make update-timing ); done -sync-commits: +update-commit-hashes sync-commits: for repo in $(REPOS); do ./scripts/sync-commit $$repo; done -sync-repos: +checkout-repos sync-repos: for repo in $(REPOS); do ./scripts/sync-repo $$repo; done .PHONY: all brief init pull push status coverage diff --git a/testing/external/README b/testing/external/README index 07d46250dc..eadae27a3e 100644 --- a/testing/external/README +++ b/testing/external/README @@ -60,9 +60,9 @@ the local Zeek codebase to a particular version of the testsuites. Normally we'd use git submodules, but cloning the testsuites with the rest of the distribution isn't always desirable or feasible. We resort to "manual submodules": a file "commit-hash." in this directory contains the commit hash to use -for the respective testsuite. The Makefile target "sync-repos" brings the local -repositories in line with commit files, while "sync-commits" updates the commit -files for locally available testsuites to their HEAD commits. +for the respective testsuite. The Makefile target "checkout-repos" brings the local +repositories in line with the commit files, while "update-commit-hashes" updates +the commit files for locally available testsuites to their HEAD commits. Updating Baseline ----------------- diff --git a/testing/external/commit-hash.zeek-testing-cluster b/testing/external/commit-hash.zeek-testing-cluster index 6b438f807e..75d29138eb 100644 --- a/testing/external/commit-hash.zeek-testing-cluster +++ b/testing/external/commit-hash.zeek-testing-cluster @@ -1 +1 @@ -70917cba506aba0816cddadd06f3d0ef16551dee +f401bfa28f40559969f6b1ba0eb2626af77d7064