From c2524b995be10fcee74c6e8b279bc17cd0596976 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Sat, 25 Jun 2011 21:06:19 -0700 Subject: [PATCH] Checkpoint. --- testing/external/Makefile | 4 ++-- testing/external/README | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/testing/external/Makefile b/testing/external/Makefile index 7aa9257333..2bd7adc144 100644 --- a/testing/external/Makefile +++ b/testing/external/Makefile @@ -1,8 +1,8 @@ -PUBLIC_REPO=/home/robin/tmp/bro-tests +PUBLIC_REPO=git://git.bro-ids.org/bro-testing all: - @for repo in *.git; do ( cd $$repo && btest ); done + @for repo in *.git; do (echo "==== $$repo" && cd $$repo && btest ); echo; done init: git clone $(PUBLIC_REPO) public.git diff --git a/testing/external/README b/testing/external/README index 88ba634d8d..51a3177407 100644 --- a/testing/external/README +++ b/testing/external/README @@ -38,7 +38,7 @@ test repository: .. console: - > cd public.git + > cd bro-testing.git > btest All the standard ``btest`` options can be used to run individual @@ -51,7 +51,7 @@ To update a test's baseline, first run ``btest`` in update mode: .. console: - > cd public.git + > cd bro-testing.git > btest -U tests/test-you-want-to-update Then use ``git`` to commit the changes and push the changes upstream @@ -66,19 +66,16 @@ public one. A helper script is provided to set up such a repository: .. console: - > ./scripts/create-new-repo private-repo /home/git/bro-private-repo + > ./scripts/create-new-repo The first argument is the local name of the repository (it will be -cloned into ``.git``); and then second is the path to the (bare) +cloned into ``.git``); and then second is the path to the git repository. The repository will be initialized with a few standard directories as well as a skeleton test in ``.git/tests``. You can then edit files as needed (and in particular add traces to ``.git/traces``). -If you want the repository to be located somewhere else than the local -machine, just push the created local repository to the right place, -delete ``.git``, and clone from the remote location. Likewise, -if you already have such a private test repository that you want to +If you already have such a private test repository that you want to include into the test suite, clone it directly into -``.git/tests``. +``.git``.