run.sh needs to handle exercises with only one test (#14)

* run.sh needs to handle exercises with only one test
In the case where there is only one test, the Odin test runner outputs "Finished 1 test ...".
The runner script was always expecting the plural "tests".

Fixes #13

* add a test

* turn on shell tracing for debugging

* undo "slimmed" image,

* remove verbose execution from run-tests.sh

Author: glennj

.dockerignore

@@ -7,4 +7,6 @@ Dockerfile
 bin/run-in-docker.sh
 bin/run-tests-in-docker.sh
 bin/run-tests.sh
+bin/benchmark.sh
+bin/benchmark-in-docker.sh
 tests/

Dockerfile

@@ -2,14 +2,15 @@
 
 ARG ODIN_REF=dev-2025-10
 
-# ---------- Build stage ----------
-FROM ubuntu:24.04 AS build
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
-      git build-essential make ca-certificates jq \
-      clang-18 llvm-18-dev \
+      git build-essential make ca-certificates \
+      clang-18 llvm-18-dev clang \
+      jq gawk locales\
   && update-ca-certificates \
+  && locale-gen en_US.UTF-8 \
   && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /src
@@ -23,26 +24,9 @@ RUN make -j"$(nproc)" release-native LLVM_CONFIG=llvm-config-18
 # Fix a bug in this Odin release.  When we upgrade, revisit this.
 RUN sed -E -i '983,984s/\<err\>/marshal_err/g' /src/Odin/core/testing/runner.odin
 
-# ---------- Runtime stage ----------
-FROM ubuntu:24.04 AS runtime
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends \
-      ca-certificates libstdc++6 libllvm18 \
-      clang lld build-essential \
-      jq gawk locales \
-  && update-ca-certificates \
-  && locale-gen en_US.UTF-8 \
-  && rm -rf /var/lib/apt/lists/*
-
-# Odin binary and libraries
-COPY --from=build /src/Odin/odin /usr/local/bin/odin
-COPY --from=build /src/Odin/core /usr/local/lib/odin/core
-COPY --from=build /src/Odin/vendor /usr/local/lib/odin/vendor
-COPY --from=build /src/Odin/base /usr/local/lib/odin/base
-
 ENV LC_ALL=en_US.UTF-8
-ENV ODIN_ROOT=/usr/local/lib/odin
+ENV ODIN_ROOT=/src/Odin
+ENV PATH="/src/Odin:${PATH}"
 
 WORKDIR /opt/test-runner
 COPY ./bin/ bin/

bin/run-tests.sh

@@ -18,7 +18,7 @@ for test_dir in tests/*; do
     test_dir_name=$(basename "${test_dir}")
     test_dir_path=$(realpath "${test_dir}")
 
-    bash -x bin/run.sh "${test_dir_name}" "${test_dir_path}" "${test_dir_path}"
+    bin/run.sh "${test_dir_name}" "${test_dir_path}" "${test_dir_path}"
 
     # OPTIONAL: Normalize the results file
     # If the results.json file contains information that changes between 

bin/run.sh

@@ -54,7 +54,7 @@ run_tests() {
 sanitize_odin_test_output() {
     gawk -v pwd="${PWD}/" '
         /To run only the failed test,/ {exit}
-        /Finished [[:digit:]]+ tests in / { sub(/ in [[:digit:].]+.s/, "") }
+        /Finished [[:digit:]]+ tests? in / { sub(/ in [[:digit:].]+.s/, "") }
         {
             gsub(pwd, "") # trim full paths from filenames
             print
@@ -77,7 +77,7 @@ write_results_v1() {
     if (( rc == 0 )); then
         jq -n '{version: 1, status: "pass"}' > "${results_file}"
     else
-        if [[ $test_output =~ .*$'\nFinished '[[:digit:]]+' tests.'.* ]]; then
+        if [[ $test_output =~ .*$'\nFinished '[[:digit:]]+' test'.* ]]; then
             # Successfully compiled, but test failures
             status='fail'
         else
@@ -235,7 +235,7 @@ parse_odin_test_output() {
 
     while IFS= read -r line; do
         if ! $seen_finished; then
-            if [[ $line == "Finished "*" tests. "*" test"*"failed." ]]; then
+            if [[ $line == "Finished "*" test"?(s)". "*" test"*"failed." ]]; then
                 seen_finished=true
             fi
         else

tests/one-test-failure/expected_results.json

@@ -0,0 +1,13 @@
+{
+  "version": 3,
+  "status": "fail",
+  "tests": [
+    {
+      "name": "No name given",
+      "message": "expected two_fer() to be One for you, one for me., got One for failure, one for me.",
+      "status": "fail",
+      "task_id": "1",
+      "test_code": "testing.expect_value(t, two_fer(), \"One for you, one for me.\")"
+    }
+  ]
+}

tests/one-test-failure/one_test_failure.odin

@@ -0,0 +1,8 @@
+package one_test_failure
+
+import "core:fmt"
+
+two_fer :: proc(name: string = "failure") -> string {
+	return fmt.tprintf("One for {}, one for me.", name)
+}
+

tests/one-test-failure/one_test_failure_test.odin

@@ -0,0 +1,11 @@
+package one_test_failure
+
+import "core:testing"
+
+@(test)
+/// description = No name given
+/// task_id = 1
+test_no_name_given :: proc(t: ^testing.T) {
+	testing.expect_value(t, two_fer(), "One for you, one for me.")
+}
+