From 207a0546b0e6f60349c21cd20f521279d218af1f Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 29 Aug 2023 23:23:31 -0400
Subject: [PATCH] Run full test suite despite default feature selection.

---
 .lighthouse/pipeline-rust-test.yaml      | 11 ++++++++++-
 Makefile                                 |  8 ++++----
 docker/organic_test/Makefile             |  2 +-
 scripts/run_docker_integration_test.bash |  2 +-
 scripts/run_integration_test.bash        |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.lighthouse/pipeline-rust-test.yaml b/.lighthouse/pipeline-rust-test.yaml
index 0f9b60c..c1b2716 100644
--- a/.lighthouse/pipeline-rust-test.yaml
+++ b/.lighthouse/pipeline-rust-test.yaml
@@ -110,7 +110,16 @@ spec:
           - build-image
         params:
           - name: args
-            value: [--no-fail-fast, --lib, --test, test_loader]
+            value:
+              [
+                --no-default-features,
+                --features,
+                compare,
+                --no-fail-fast,
+                --lib,
+                --test,
+                test_loader,
+              ]
           - name: docker-image
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
diff --git a/Makefile b/Makefile
index 86593f5..0f6eee1 100644
--- a/Makefile
+++ b/Makefile
@@ -35,12 +35,12 @@ clean:
 
 .PHONY: test
 test:
-> cargo test --no-fail-fast --lib --test test_loader -- --test-threads $(TESTJOBS)
+> cargo test --no-default-features --features compare --no-fail-fast --lib --test test_loader -- --test-threads $(TESTJOBS)
 
 .PHONY: dockertest
 dockertest:
 > $(MAKE) -C docker/organic_test
-> docker run --init --rm -i -t -v "$$(readlink -f ./):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source organic-test --no-fail-fast --lib --test test_loader -- --test-threads $(TESTJOBS)
+> docker run --init --rm -i -t -v "$$(readlink -f ./):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source organic-test --no-default-features --features compare --no-fail-fast --lib --test test_loader -- --test-threads $(TESTJOBS)
 
 .PHONY: dockerclean
 dockerclean:
@@ -49,11 +49,11 @@ dockerclean:
 
 .PHONY: integrationtest
 integrationtest:
-> cargo test --no-fail-fast --test test_loader -- --test-threads $(TESTJOBS)
+> cargo test --no-default-features --features compare --no-fail-fast --test test_loader -- --test-threads $(TESTJOBS)
 
 .PHONY: unittest
 unittest:
-> cargo test --lib -- --test-threads $(TESTJOBS)
+> cargo test --no-default-features --lib -- --test-threads $(TESTJOBS)
 
 .PHONY: jaeger
 jaeger:
diff --git a/docker/organic_test/Makefile b/docker/organic_test/Makefile
index d2c1aad..568679b 100644
--- a/docker/organic_test/Makefile
+++ b/docker/organic_test/Makefile
@@ -29,7 +29,7 @@ endif
 
 .PHONY: run
 run: build
-	docker run --rm --init -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME) --no-fail-fast --lib --test test_loader
+	docker run --rm --init -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME) --no-default-features --features compare --no-fail-fast --lib --test test_loader
 
 .PHONY: shell
 shell: build
diff --git a/scripts/run_docker_integration_test.bash b/scripts/run_docker_integration_test.bash
index 3539dc1..9fcea50 100755
--- a/scripts/run_docker_integration_test.bash
+++ b/scripts/run_docker_integration_test.bash
@@ -52,7 +52,7 @@ function launch_container {
 set -euo pipefail
 IFS=\$'\n\t'
 
-cargo test --no-fail-fast --lib --test test_loader "$test" -- --show-output
+cargo test --no-default-features --features compare --no-fail-fast --lib --test test_loader "$test" -- --show-output
 EOF
           )
 
diff --git a/scripts/run_integration_test.bash b/scripts/run_integration_test.bash
index a8899f6..752eba0 100755
--- a/scripts/run_integration_test.bash
+++ b/scripts/run_integration_test.bash
@@ -12,7 +12,7 @@ function main {
 
     local test
     while read test; do
-        cargo test --no-fail-fast --test test_loader "$test" -- --show-output
+        cargo test --no-default-features --features compare --no-fail-fast --test test_loader "$test" -- --show-output
     done<<<"$test_names"
 }