Minor updates to the external-testsuite scripts

Delete the unused Baseline folder, remove a Bro-era name from gitignore,
change create-new-repo to work with a second argument that is actually
a URL, and tweak whitespace. Expand description in README and update the
explanation of OPENSSL_ENABLE_MD5_VERIFY in subdir-btest.cfg.
This commit is contained in:
Christian Kreibich 2021-09-01 17:08:44 -07:00
parent 6997f83e57
commit b999448e3d
6 changed files with 28 additions and 29 deletions

View file

@ -1,5 +1,4 @@
*.git
diag.log
bro-testing*
zeek-testing*
.proxy

View file

View file

@ -81,19 +81,21 @@ script to set that up:
.. console:
> ./scripts/create-new-repo <repo-name> <repo-url>
> ./scripts/create-new-repo <repo-name> [<repo-url>]
The first argument is the local name of the repository (it will be
cloned into ``<repo-name>``); and the second is the URL of the git
repository. The repository will be initialized with a few standard
directories as well as a skeleton test in ``<name>/tests``. You can
then edit files as needed. You add trace files by editing
``Traces/traces.cfg``; see the comments in there. For each trace, you
also need to calculate a checksum with ``md5sum`` and put it into
``<url>.md5sum``. The scripts use this to decide if they need to
redownload the trace. Accordingly, if you update a trace, make sure to
also recalculate its checksum. Note that the traces will be downloaded
to ``Traces/`` but must not be added to the git repostiory; there's a
``.gitignore`` installed to prevent that.
The first argument is the local name of the repository (it will be initialized
in a ``<repo-name>`` directory). The second, optional argument is the URL of the
git repository. The repository will be initialized with a few standard
directories as well as a skeleton test in ``<name>/tests``. You can then edit
files as needed. When provided, the remote URL is added as the origin remote.
The script does not otherwise interact with the remote.
You add trace files by editing ``Traces/traces.cfg``; see the comments in
there. For each trace, you also need to calculate a checksum with ``md5sum`` and
put it into ``<url>.md5sum``. The scripts use this to decide if they need to
redownload the trace. Accordingly, if you update a trace, make sure to also
recalculate its checksum. Note that the traces will be downloaded to ``Traces/``
but must not be added to the git repostiory; there's a ``.gitignore`` installed
to prevent that.

View file

@ -1,31 +1,26 @@
#! /usr/bin/env bash
#
# Helper script for creating new external testing repos. See the
# README for details.
cwd=`pwd`
if [ $# != 2 ]; then
echo "usage: $0 <name> <dst-repo-dir>"
if [ -z "$1" ]; then
echo "usage: $0 <name> [<dst-repo-url>]"
exit 1
fi
name=`pwd`/$1
repo=$2
if [ -e $repo ]; then
echo "$repo already exists, aborting."
exit 1
fi
if [ -e $name ]; then
echo "$name already exists, aborting."
exit 1
fi
mkdir $repo
( cd $repo && git init --bare )
git clone $repo $name
mkdir $name
cd $name
git init
for dir in tests Baseline; do
mkdir $dir
@ -42,4 +37,7 @@ cp $cwd/`dirname $0`/skel/.gitignore .
git add * .gitignore
git commit -m "Repository initialized."
git push origin master
if [ -n "$repo" ]; then
git remote add origin $repo
fi

View file

@ -21,6 +21,6 @@ DIST=%(testbase)s/../../..
BUILD=%(testbase)s/../../../build
ZEEK_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
ZEEK_DNS_FAKE=1
# For fedora 21 - they disable MD5 for certificate verification and need setting an environment variable to permit it.
# Fedora/CentOS/RedHat have MD5 disabled for certificate verification and need setting an environment variable to permit it:
OPENSSL_ENABLE_MD5_VERIFY=1
UBSAN_OPTIONS=print_stacktrace=1