From 6e920bd2365f674eff8e101e6c9fd3f3bcae73fe Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 25 Jun 2025 19:17:50 +1200 Subject: [PATCH] test: Update 3 files --- dehydrate/build.sh | 4 +--- dehydrate/src/main.cpp | 6 ++++-- dehydrate/test.sh | 13 ++++++------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dehydrate/build.sh b/dehydrate/build.sh index cfb6f1f..841dedf 100755 --- a/dehydrate/build.sh +++ b/dehydrate/build.sh @@ -3,15 +3,13 @@ set -euo pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" - +PROJECT="dehydrate" export CMAKE_BUILD_TYPE="Debug" rm -rf "${SCRIPT_DIR}/output" mkdir -p "${SCRIPT_DIR}/output" -PROJECT="dehydrate" - # make sure we have the latest base image. docker pull gitea.jde.nz/public/dropshell-build-base:latest diff --git a/dehydrate/src/main.cpp b/dehydrate/src/main.cpp index 48247cf..32e7c45 100644 --- a/dehydrate/src/main.cpp +++ b/dehydrate/src/main.cpp @@ -71,8 +71,10 @@ int main(int argc, char* argv[]) { return update(); } - // Show version for normal operations - std::cout << "Dehydrate version " << VERSION << std::endl; + // Show version for normal operations (unless silent) + if (!args.silent) { + std::cout << "Dehydrate version " << VERSION << std::endl; + } std::filesystem::path src(args.source); if (!std::filesystem::exists(src)) { diff --git a/dehydrate/test.sh b/dehydrate/test.sh index 752bcac..26b7077 100755 --- a/dehydrate/test.sh +++ b/dehydrate/test.sh @@ -1,10 +1,9 @@ #!/bin/bash -# Don't use set -e because we want to continue even if tests fail -set -uo pipefail +set -euo pipefail +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" PROJECT="dehydrate" -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" DEHYDRATE="${SCRIPT_DIR}/output/${PROJECT}" TEST_DIR="${SCRIPT_DIR}/test_temp" @@ -24,10 +23,10 @@ print_test_result() { local result="$2" if [ "$result" -eq 0 ]; then echo -e "${GREEN}✓${NC} $test_name" - ((TESTS_PASSED++)) + TESTS_PASSED=$((TESTS_PASSED + 1)) else echo -e "${RED}✗${NC} $test_name" - ((TESTS_FAILED++)) + TESTS_FAILED=$((TESTS_FAILED + 1)) fi } @@ -71,7 +70,7 @@ else fi # Test 2: Help command (shows help when no args provided) -echo -e "\nTest 2: Help command" +printf "\nTest 2: Help command\n" HELP_OUTPUT=$("$DEHYDRATE" 2>&1 || true) if [[ "$HELP_OUTPUT" =~ "Usage: dehydrate" ]] && [[ "$HELP_OUTPUT" =~ "Converts existing files" ]]; then print_test_result "Help command output" 0 @@ -88,7 +87,7 @@ echo "int main() { return 0; }" > "$TEST_SRC_DIR/main.cpp" echo "#include " > "$TEST_SRC_DIR/header.hpp" # Run dehydrate on the test source -DEHYDRATE_OUTPUT=$("$DEHYDRATE" "$TEST_SRC_DIR" "$TEST_DIR" 2>&1 || true) +"$DEHYDRATE" -s "$TEST_SRC_DIR" "$TEST_DIR" # Dehydrate creates files with pattern _.{cpp,hpp} if [ -f "$TEST_DIR/_test_src.hpp" ] && [ -f "$TEST_DIR/_test_src.cpp" ]; then print_test_result "Basic dehydration creates output files" 0