htscoremain/htsalias: share the cmdl_* argv-block macros from htsalias.h

cmdl_room/cmdl_add/cmdl_ins were copy-pasted between htscoremain.c (the CLI
parser) and htsalias.c (config-file alias expansion), tagged "COPY OF cmdl_ins
in htscoremain.c". The copies had already drifted: htscoremain advanced the
pack offset by strlen+2, htsalias by strlen+1. Both are correct (a token plus
its NUL is L+1 bytes; +2 just leaves a one-byte gap), so the argv content was
identical either way, but two definitions of the same thing is one too many.

Move all three into htsalias.h (internal, gated by HTS_INTERNAL_BYTECODE,
already included by both translation units) and unify on the tight +1. This
only shrinks the inter-token gap in htscoremain's x_argvblk; every argv[] entry
is still an independently NUL-terminated string read through its own pointer,
so behavior is unchanged and the +32768 slack is untouched.

Adds 01_engine-doitlog.test for the doit.log reprise path, which drives
htscoremain's cmdl_ins (re-running httrack with no url re-inserts each recorded
argument) and had no coverage: 02_update-cache always passes a url, and
01_engine-rcfile exercises only the htsalias.c side. The test mirrors a file://
fixture, re-runs with no url, and asserts the reprise re-mirrors cleanly and
re-crawls the inserted url after a source change. Teeth-checked: dropping the
+1 makes the inserted tokens run together and the test fails on the resulting
crawl error.

make check: 16 PASS, 7 SKIP (offline). shellcheck clean.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Xavier Roche <roche@httrack.com>

.github/workflows/ci.yml

@@ -320,37 +320,17 @@ jobs:
   lint:
     name: lint (shellcheck, shfmt)
     runs-on: ubuntu-24.04
-    env:
-      SHFMT_VERSION: v3.8.0
     steps:
       - uses: actions/checkout@v6
 
-      # shfmt is a pinned release binary, so it never changes: cache it keyed on
-      # the version. Same rationale as the git-clang-format driver below -- avoid
-      # re-downloading an unchanging file from github.com on every run.
-      - name: Cache shfmt binary
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/shfmt/shfmt
-          key: shfmt-${{ env.SHFMT_VERSION }}-${{ runner.arch }}
-
       - name: Install linters
         run: |
           set -euo pipefail
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends shellcheck
-          # shfmt is not packaged in apt; fetch a pinned release binary (cold
-          # cache only), retrying through transient errors.
-          shfmt="$HOME/.cache/shfmt/shfmt"
-          if [ ! -s "$shfmt" ]; then
-            echo "shfmt cache MISS: fetching ${SHFMT_VERSION} from github.com"
-            mkdir -p "$(dirname "$shfmt")"
-            curl --retry 5 --retry-all-errors -fsSL -o "$shfmt" \
-              "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/shfmt_${SHFMT_VERSION}_linux_$(dpkg --print-architecture)"
-          else
-            echo "shfmt cache HIT: using cached ${SHFMT_VERSION}"
-          fi
-          sudo install -m 0755 "$shfmt" /usr/local/bin/shfmt
+          # noble ships shfmt 3.8.0 (universe), matching the pinned local dev
+          # version; use it rather than fetching a release binary from github.com.
+          sudo apt-get install -y --no-install-recommends shellcheck shfmt
+          shfmt --version
 
       # Lint the scripts we maintain; the legacy scripts are a separate cleanup.
       - name: shellcheck
@@ -366,24 +346,11 @@ jobs:
     name: format (clang-format-19, changed lines)
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
-    env:
-      # Single-source the tag so the cache key and the fetch URL can never drift.
-      LLVM_TAG: llvmorg-19.1.7
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      # The git-clang-format driver is pinned to an immutable release tag, so the
-      # fetched file never changes: cache it keyed on the tag. raw.githubusercontent.com
-      # 429-rate-limits the shared runner egress IPs, and re-downloading an unchanging
-      # file every run was the only thing that could (and did) hit that limit.
-      - name: Cache git-clang-format driver
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/git-clang-format/git-clang-format
-          key: git-clang-format-${{ env.LLVM_TAG }}
-
       - name: Install clang-format 19 (pinned, from apt.llvm.org)
         run: |
           set -euo pipefail
@@ -394,17 +361,9 @@ jobs:
             | sudo tee /etc/apt/sources.list.d/llvm-19.list >/dev/null
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends clang-format-19
-          # Cold cache only: fetch the driver, retrying through transient 429s.
-          driver="$HOME/.cache/git-clang-format/git-clang-format"
-          if [ ! -s "$driver" ]; then
-            echo "git-clang-format cache MISS: fetching ${LLVM_TAG} from raw.githubusercontent.com"
-            mkdir -p "$(dirname "$driver")"
-            curl --retry 5 --retry-all-errors -fsSL -o "$driver" \
-              "https://raw.githubusercontent.com/llvm/llvm-project/${LLVM_TAG}/clang/tools/clang-format/git-clang-format"
-          else
-            echo "git-clang-format cache HIT: using cached ${LLVM_TAG}"
-          fi
-          sudo install -m 0755 "$driver" /usr/local/bin/git-clang-format
+          # The clang-format-19 package ships the git-clang-format driver;
+          # expose it unsuffixed so "git clang-format" finds it.
+          sudo ln -sf /usr/bin/git-clang-format-19 /usr/local/bin/git-clang-format
           clang-format-19 --version
 
       - name: Check formatting of changed lines
@@ -418,10 +377,9 @@ jobs:
                     --diff --extensions c,h "$base")"
           rc=$?
           set -e
-          # Classify by output first: a non-empty diff means "not clean",
-          # regardless of the driver's exit convention (the release-tag driver
-          # exits 0 and signals via stdout; some packaged drivers exit 1 on a
-          # diff). A nonzero exit with clean output is a real checker error.
+          # Classify by output, not exit code: a non-empty diff means "not
+          # clean" (git-clang-format may exit 0 or 1 on a diff). A nonzero exit
+          # with clean output is a real checker error.
           case "$diff" in
             "" | "no modified files to format" | *"did not modify any files"*)
               if [ "$rc" -ne 0 ]; then

src/htsalias.c

@@ -41,25 +41,6 @@ Please visit our Website: http://www.httrack.com
 
 #define _NOT_NULL(a) ( (a!=NULL) ? (a) : "" )
 
-// COPY OF cmdl_ins in htscoremain.c
-/* Bytes left in x_argvblk from offset ptr. The offset can in principle outrun
-   the block (alias/doit.log expansion), so the copy aborts cleanly instead of
-   the subtraction wrapping to a huge unbounded size. */
-#define cmdl_room(bufsize, ptr)                                                \
-  ((ptr) < (size_t) (bufsize) ? (size_t) (bufsize) - (ptr) : 0)
-// Insert a command in the argc/argv (buff has total capacity bufsize)
-#define cmdl_ins(token, argc, argv, buff, bufsize, ptr)                        \
-  {                                                                            \
-    int i;                                                                     \
-    for (i = argc; i > 0; i--)                                                 \
-      argv[i] = argv[i - 1];                                                   \
-  }                                                                            \
-  argv[0] = (buff + ptr);                                                      \
-  strlcpybuff(argv[0], token, cmdl_room(bufsize, ptr));                        \
-  ptr += (int) (strlen(argv[0]) + 1);                                          \
-  argc++
-// END OF COPY OF cmdl_ins in htscoremain.c
-
 /*
   Aliases for command-line and config file definitions
   These definitions can be used:

src/htsalias.h

@@ -52,6 +52,34 @@ const char *opttype_value(int p);
 const char *opthelp_value(int p);
 const char *hts_gethome(void);
 void expand_home(String * str);
+
+/* Command-line argv-block builders, shared by htscoremain.c (the CLI parser)
+   and htsalias.c (config-file alias expansion). Tokens are packed back-to-back
+   into x_argvblk (total capacity bufsize); each argv[] entry points into the
+   block. cmdl_room bounds every copy: the running offset ptr can outrun the
+   block (alias / doit.log expansion outpacing the +32768 slack), so it yields
+   0 rather than a wrapped size_t and the bounded copy aborts cleanly. */
+#define cmdl_room(bufsize, ptr)                                                \
+  ((ptr) < (size_t) (bufsize) ? (size_t) (bufsize) - (ptr) : 0)
+
+/* Append a token as a new argv[argc]. */
+#define cmdl_add(token, argc, argv, buff, bufsize, ptr)                        \
+  argv[argc] = (buff + ptr);                                                   \
+  strlcpybuff(argv[argc], token, cmdl_room(bufsize, ptr));                     \
+  ptr += (int) (strlen(argv[argc]) + 1);                                       \
+  argc++
+
+/* Insert a token at argv[0], shifting the existing argc entries up by one. */
+#define cmdl_ins(token, argc, argv, buff, bufsize, ptr)                        \
+  {                                                                            \
+    int i;                                                                     \
+    for (i = argc; i > 0; i--)                                                 \
+      argv[i] = argv[i - 1];                                                   \
+  }                                                                            \
+  argv[0] = (buff + ptr);                                                      \
+  strlcpybuff(argv[0], token, cmdl_room(bufsize, ptr));                        \
+  ptr += (int) (strlen(argv[0]) + 1);                                          \
+  argc++
 #endif
 
 #endif

src/htscoremain.c

@@ -69,31 +69,6 @@ Please visit our Website: http://www.httrack.com
 /* Resolver */
 extern int IPV6_resolver;
 
-/* Remaining room in the argv block; 0 once it is exhausted (alias expansion or
-   doit.log insertion can outrun the +32768 slack), so the copy aborts cleanly
-   instead of the subtraction wrapping to a huge unbounded size. */
-#define cmdl_room(bufsize, ptr)                                                \
-  ((ptr) < (size_t) (bufsize) ? (size_t) (bufsize) - (ptr) : 0)
-
-// Add a command in the argc/argv (buff has total capacity bufsize)
-#define cmdl_add(token, argc, argv, buff, bufsize, ptr)                        \
-  argv[argc] = (buff + ptr);                                                   \
-  strlcpybuff(argv[argc], token, cmdl_room(bufsize, ptr));                     \
-  ptr += (int) (strlen(argv[argc]) + 2);                                       \
-  argc++
-
-// Insert a command in the argc/argv (buff has total capacity bufsize)
-#define cmdl_ins(token, argc, argv, buff, bufsize, ptr)                        \
-  {                                                                            \
-    int i;                                                                     \
-    for (i = argc; i > 0; i--)                                                 \
-      argv[i] = argv[i - 1];                                                   \
-  }                                                                            \
-  argv[0] = (buff + ptr);                                                      \
-  strlcpybuff(argv[0], token, cmdl_room(bufsize, ptr));                        \
-  ptr += (int) (strlen(argv[0]) + 2);                                          \
-  argc++
-
 #define htsmain_free() do { \
   if (url != NULL) { \
     free(url); \

tests/00_runnable.test

@@ -1,5 +1,7 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # check that httrack starts
 httrack --version >/dev/null

tests/01_engine-charset.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # charset -> UTF-8 conversion (hts_convertStringToUTF8).
 # -#3 <charset> <string> prints the string re-decoded from <charset> as UTF-8.
 conv() {

tests/01_engine-cmdline.test

@@ -8,7 +8,7 @@
 # --headers) forms, and an over-cap value is refused cleanly rather than
 # overrunning a fixed scratch buffer.
 
-set -u
+set -euo pipefail
 
 tmp=$(mktemp -d "${TMPDIR:-/tmp}/httrack_cmdline.XXXXXX") || exit 1
 trap 'rm -rf "$tmp"' EXIT HUP INT QUIT PIPE TERM
@@ -26,8 +26,8 @@ run() {
     shift
     rm -rf "$out"
     mkdir -p "$out"
-    httrack "file://$tmp/index.html" -O "$out" --quiet -n "$@" >"$out/.log" 2>&1
-    RC=$?
+    RC=0
+    httrack "file://$tmp/index.html" -O "$out" --quiet -n "$@" >"$out/.log" 2>&1 || RC=$?
 }
 
 # crawl using exactly the given args as the only URL(s), no implicit primary URL;
@@ -37,8 +37,8 @@ run_only() {
     shift
     rm -rf "$out"
     mkdir -p "$out"
-    httrack -O "$out" --quiet -n "$@" >"$out/.log" 2>&1
-    RC=$?
+    RC=0
+    httrack -O "$out" --quiet -n "$@" >"$out/.log" 2>&1 || RC=$?
 }
 
 # assert the value was accepted: clean exit and the fixture was mirrored

tests/01_engine-doitlog.test

@@ -0,0 +1,92 @@
+#!/bin/bash
+#
+
+# doit.log reprise (no network). Re-running httrack in a mirror directory with
+# NO url makes the engine read hts-cache/doit.log and re-insert every recorded
+# argument into the command line through htscoremain.c's cmdl_ins macro (the
+# x_argvblk builder). That path is distinct from the rc-file one in
+# 01_engine-rcfile.test (htsalias.c) and from the url-on-command-line update in
+# 02_update-cache.test, and nothing else exercises it. Two properties:
+#   1. A multi-token reprise re-mirrors cleanly: every token (the url and each
+#      option) survives the back-to-back packing, so the no-url run reproduces
+#      the file set with no errors. A packing/bound bug corrupts a later token
+#      and surfaces as an error or a missing file.
+#   2. The reprise actually re-crawls through the inserted url: changing a source
+#      file and re-running with no url picks up the new content.
+
+set -euo pipefail
+
+# Resolve httrack to an absolute path before we cd: PATH may hold a
+# build-relative entry that would not resolve from the temp directory.
+bin=$(command -v httrack) || {
+    echo "FAIL: httrack not found on PATH"
+    exit 1
+}
+case "$bin" in
+/*) ;;
+*) bin="$(cd "$(dirname "$bin")" && pwd)/$(basename "$bin")" ;;
+esac
+
+tmp=$(mktemp -d "${TMPDIR:-/tmp}/httrack_doitlog.XXXXXX") || exit 1
+trap 'rm -rf "$tmp"' EXIT HUP INT QUIT PIPE TERM
+
+site="$tmp/site"
+out="$tmp/out"
+mkdir -p "$site/sub"
+printf '<a href="a.html">a</a> <a href="sub/b.html">b</a>' >"$site/index.html"
+echo 'OLDCONTENT' >"$site/a.html"
+echo '<p>bbb</p>' >"$site/sub/b.html"
+url="file://$site/index.html"
+
+# count Error: lines in the log (grep -c exits 1 on zero matches: guard it)
+errors() { grep -ciE '^[0-9:]*[[:space:]]Error:' "$out/hts-log.txt" || true; }
+
+# initial mirror with the url and a handful of options, so doit.log records a
+# multi-token command line for cmdl_ins to re-insert one token at a time.
+rc=0
+"$bin" "$url" -O "$out" --quiet -n -%v0 -r3 >/dev/null 2>&1 || rc=$?
+test "$rc" -eq 0 || {
+    echo "FAIL: initial mirror exited $rc"
+    exit 1
+}
+test -f "$out/hts-cache/doit.log" || {
+    echo "FAIL: doit.log not written by the initial mirror"
+    exit 1
+}
+
+# --- 1. no-url reprise re-mirrors cleanly -----------------------------------
+# No url on the command line, so the engine loads doit.log and re-inserts the
+# recorded arguments (cmdl_ins). -O selects the mirror; argv carries no url.
+rc=0
+"$bin" -O "$out" --quiet >/dev/null 2>&1 || rc=$?
+test "$rc" -eq 0 || {
+    echo "FAIL: doit.log reprise exited $rc"
+    exit 1
+}
+test "$(errors)" = 0 || {
+    echo "FAIL: doit.log reprise reported errors (a token may have been corrupted)"
+    grep -iE 'Error:' "$out/hts-log.txt" | head -3
+    exit 1
+}
+for suffix in a.html sub/b.html; do
+    test -n "$(find "$out" -path "*/$suffix" -print -quit)" || {
+        echo "FAIL: $suffix missing after the no-url reprise"
+        exit 1
+    }
+done
+
+# --- 2. the reprise re-crawls through the inserted url -----------------------
+sleep 1
+echo 'NEWCONTENT' >"$site/a.html"
+rc=0
+"$bin" -O "$out" --quiet >/dev/null 2>&1 || rc=$?
+test "$rc" -eq 0 || {
+    echo "FAIL: second reprise exited $rc"
+    exit 1
+}
+grep -q NEWCONTENT "$(find "$out" -path '*/a.html' -print -quit)" || {
+    echo "FAIL: reprise did not pick up the changed source (inserted url not re-crawled)"
+    exit 1
+}
+
+exit 0

tests/01_engine-entities.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # HTML entity unescaping (hts_unescapeEntitiesWithCharset).
 # -#6 <string> prints the string with entities decoded (UTF-8 output).
 ent() {

tests/01_engine-filter.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # wildcard filter engine (strjoker), the core of +/- include/exclude rules.
 # -#0 <filter> <string> prints "<string> does match <filter>" or "... does NOT match ...".
 

tests/01_engine-hashtable.test

@@ -1,5 +1,7 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # httrack internal hashtable autotest on 100K keys
 httrack -#7 100000

tests/01_engine-idna.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # IDNA / punycode encode (-#4) and decode (-#5). This code has a CVE history,
 # so the edge cases below cover passthrough, round-trips, and malformed input.
 

tests/01_engine-mime.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # MIME type guessing from extension (get_httptype / give_mimext).
 # -#2 <path> prints "<path> is '<mime>'" then "and its local type is '.<ext>'".
 

tests/01_engine-parse.test

@@ -4,7 +4,7 @@
 # Offline HTML parser tests: each section crawls a file:// fixture (no network)
 # and checks which assets the parser captured and how it rewrote the links.
 
-set -u
+set -euo pipefail
 
 tmp=$(mktemp -d "${TMPDIR:-/tmp}/httrack_parse.XXXXXX") || exit 1
 trap 'rm -rf "$tmp"' EXIT HUP INT QUIT PIPE TERM
@@ -19,7 +19,9 @@ crawl() {
     local html="$1" out="$2"
     rm -rf "$out"
     mkdir -p "$out"
-    httrack "file://$html" -O "$out" --quiet --near -n >"$out/.log" 2>&1
+    # the crawl's own exit status is irrelevant here; the assertions below check
+    # the mirrored files, so don't let set -e trip on a non-zero httrack exit
+    httrack "file://$html" -O "$out" --quiet --near -n >"$out/.log" 2>&1 || true
 }
 
 # assert a file with the given basename was saved somewhere under <out>

tests/01_engine-simplify.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # path simplify engine (fil_simplifie): collapses ./ and ../ segments.
 simp() {
 	test "$(httrack -O /dev/null -#1 "$1")" == "simplified=$2" || exit 1

tests/01_engine-strsafe.test

@@ -1,13 +1,16 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 # htssafe.h bounded string operations (driven by 'httrack -#8').
 
 # Success path: every bounded op (strcpybuff/strcatbuff/strncatbuff/strlcpybuff)
 # must behave correctly. Like the other -# debug modes, a trailing token is
 # required (a bare '-#8' falls through to the usage screen).
-out=$(httrack -#8 run)
-test $? -eq 0 || exit 1
+rc=0
+out=$(httrack -#8 run) || rc=$?
+test "$rc" -eq 0 || exit 1
 test "$out" == "strsafe: OK" || exit 1
 
 # Overflow path: an over-capacity write into a sized buffer must be caught by
@@ -15,7 +18,8 @@ test "$out" == "strsafe: OK" || exit 1
 # Assert the htssafe abort signature specifically, so the test cannot pass for
 # an unrelated reason (e.g. the -#8 mode being gone and falling through to the
 # usage screen, which also exits non-zero).
-err=$(httrack -#8 overflow "this string is far too long for the buffer" 2>&1)
+# the bounded macro aborts (non-zero exit), so don't let set -e trip on it
+err=$(httrack -#8 overflow "this string is far too long for the buffer" 2>&1) || true
 case "$err" in
 	*"strsafe: NOT aborted"*) echo "over-capacity write was NOT caught" >&2; exit 1 ;;
 	*"overflow while copying"*) ;;
@@ -26,7 +30,7 @@ esac
 # capacity (4 bytes into a 4-byte buffer), so this also pins the boundary: a
 # '<=' off-by-one in the capacity check would let it through (and print "NOT
 # aborted"). Match the specific htsbuff abort message, not just any assert.
-err=$(httrack -#8 overflow-buff "abcd" 2>&1)
+err=$(httrack -#8 overflow-buff "abcd" 2>&1) || true
 case "$err" in
 	*"strsafe: NOT aborted"*) echo "htsbuff over-capacity write was NOT caught" >&2; exit 1 ;;
 	*"htsbuff append overflow"*) ;;

tests/02_manpage-regen.test

@@ -8,6 +8,9 @@
 # POSIX /bin/sh on some platforms (e.g. macOS), so avoid bashisms (such as
 # process substitution) despite the #!/bin/bash above.
 
+# pipefail is a bashism; keep to POSIX set flags ($(BASH) may be /bin/sh here).
+set -eu
+
 : "${top_srcdir:=..}"
 
 gen="$top_srcdir/man/makeman.sh"

tests/02_update-cache.test

@@ -10,7 +10,7 @@
 #   2. change a source file, re-mirror -> the update must pick up the new content
 #      (guards the update decision that reads the cached metadata).
 
-set -eu
+set -euo pipefail
 
 site=$(mktemp -d)
 out=$(mktemp -d)
@@ -42,7 +42,7 @@ test "$(errors)" = 0 || {
     exit 1
 }
 for suffix in a.html sub/b.html; do
-    find "$out" -path "*/$suffix" | grep -q . || {
+    test -n "$(find "$out" -path "*/$suffix" -print -quit)" || {
         echo "missing $suffix after update" >&2
         exit 1
     }

tests/10_crawl-simple.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
 bash crawl-test.sh --errors 0 --files 5 httrack http://ut.httrack.com/simple/basic.html

tests/11_crawl-cookies.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
 bash crawl-test.sh --errors 0 --files 3 \

tests/11_crawl-idna.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
 # unicode tests

tests/11_crawl-international.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
 # unicode tests

tests/11_crawl-longurl.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
 # http://code.google.com/p/httrack/issues/detail?id=42&can=1

tests/11_crawl-parsing.test

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
 # http://code.google.com/p/httrack/issues/detail?id=4&can=1

tests/12_crawl_https.test

@@ -1,9 +1,11 @@
 #!/bin/bash
 #
 
+set -euo pipefail
+
 bash check-network.sh ||  ! echo "skipping online unit tests" || exit 77
 
-if test "$HTTPS_SUPPORT" == "no"; then
+if test "${HTTPS_SUPPORT:-}" == "no"; then
 	echo "no https support compiled, skipping"
 	exit 77
 fi

tests/Makefile.am

@@ -19,6 +19,7 @@ TESTS = \
 	01_engine-cache.test \
 	01_engine-charset.test \
 	01_engine-cmdline.test \
+	01_engine-doitlog.test \
 	01_engine-entities.test \
 	01_engine-filter.test \
 	01_engine-hashtable.test \