From 4908edb115a8c5d6c94f1f8b2ed6b980d6b3bd1b Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Wed, 14 Jan 2026 13:41:28 -0500 Subject: [PATCH] tweak rules and test harness to do nothing if there's nothing to do --- src/bin/unit_test_attribute.c | 6 +++--- src/tests/unit/all.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c index 955acaa7e29..33a6d0a1b53 100644 --- a/src/bin/unit_test_attribute.c +++ b/src/bin/unit_test_attribute.c @@ -4539,7 +4539,7 @@ int main(int argc, char *argv[]) /* * Read test commands from stdin */ - if (argc < 2) { + if ((argc < 2) && !receipt_dir) { if (write_filename) { ERROR("Can only use '-w' with input files"); EXIT_WITH_FAILURE; @@ -4582,7 +4582,7 @@ int main(int argc, char *argv[]) if ((ret != EXIT_SUCCESS) || exit_now) break; } - } else { + } else if (argc > 1) { int i; /* @@ -4592,7 +4592,7 @@ int main(int argc, char *argv[]) ret = process_path(&exit_now, autofree, &config, argv[i]); if ((ret != EXIT_SUCCESS) || exit_now) break; } - } + } /* nothing to do */ /* * Try really hard to free any allocated diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk index 3402b6a459a..94978f27835 100644 --- a/src/tests/unit/all.mk +++ b/src/tests/unit/all.mk @@ -90,12 +90,12 @@ $(filter $(BUILD_DIR)/tests/unit/purify/%,$(FILES.$(TEST))): PURIFY=-p $(addprefix $(OUTPUT)/,$(FILES_NORMAL)) &: $(addprefix src/tests/unit/,$(FILES_NORMAL)) $(eval DIR:=${top_srcdir}/src/tests/unit) $(eval export UNIT_TEST_ATTRIBUTE:=TZ=GMT $(TEST_BIN_NO_TIMEOUT)/unit_test_attribute $(PURIFY) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/) - ${Q}$(TEST_BIN)/unit_test_attribute $(REWRITE_FLAGS) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/ $(filter src/tests/unit/%,$?) + ${Q}$(TEST_BIN)/unit_test_attribute $(REWRITE_FLAGS) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/ $(filter src/tests/unit/%,$(filter-out build/%,$?)) $(addprefix $(OUTPUT)/,$(FILES_PURIFY)) &: $(addprefix src/tests/unit/,$(FILES_PURIFY)) $(eval DIR:=${top_srcdir}/src/tests/unit) $(eval export UNIT_TEST_ATTRIBUTE:=TZ=GMT $(TEST_BIN_NO_TIMEOUT)/unit_test_attribute $(PURIFY) -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -p -r build/tests/unit/) - ${Q}$(TEST_BIN)/unit_test_attribute $(REWRITE_FLAGS) -p -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/ $(filter src/tests/unit/%,$?) + ${Q}$(TEST_BIN)/unit_test_attribute $(REWRITE_FLAGS) -p -F ./src/tests/fuzzer-corpus -D ./share/dictionary -d $(DIR) -r build/tests/unit/ $(filter src/tests/unit/%,$(filter-out build/%,$?)) # # And the actual script to run each test. -- 2.47.3