diff --git a/CHANGES b/CHANGES index 11f7002693..0dfccf9909 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -5.2.0-dev.389 | 2022-11-30 13:45:24 +0000 +5.2.0-dev.391 | 2022-11-30 15:37:57 +0000 * script optimization fixes: (Vern Paxson, Corelight) new initialization model for standalone C++ scripts diff --git a/VERSION b/VERSION index 65f1a81859..3564dfdf7a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0-dev.389 +5.2.0-dev.391 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 b/testing/external/commit-hash.zeek-testing index 0406d2369c..ef4a886d68 100644 --- a/testing/external/commit-hash.zeek-testing +++ b/testing/external/commit-hash.zeek-testing @@ -1 +1 @@ -176b2db6ce7b151f1ac87ca0766d5910a36a0532 +12af5c4f227b99a8424e8ef00ae6611b8b767e4c diff --git a/testing/external/commit-hash.zeek-testing-cluster b/testing/external/commit-hash.zeek-testing-cluster index 6b438f807e..d7e1f4c802 100644 --- a/testing/external/commit-hash.zeek-testing-cluster +++ b/testing/external/commit-hash.zeek-testing-cluster @@ -1 +1 @@ -70917cba506aba0816cddadd06f3d0ef16551dee +04b919ed3e29e1b07e21ca4308fae06fe5e976d3