From f5745afd83f50fbd401bd17064e04dfbd44165ae Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 12 Nov 2024 20:20:43 -0400 Subject: [PATCH] Split CLI tests by edition Signed-off-by: Juan Cruz Viotti --- Dockerfile.ce | 2 +- Dockerfile.ee | 2 +- Makefile | 9 ++++++--- test/cli/{ => ce}/index/no-options.sh | 0 test/cli/{ => ce}/index/no-output.sh | 0 test/cli/{ => common}/index/invalid-configuration.sh | 0 6 files changed, 8 insertions(+), 5 deletions(-) rename test/cli/{ => ce}/index/no-options.sh (100%) rename test/cli/{ => ce}/index/no-output.sh (100%) rename test/cli/{ => common}/index/invalid-configuration.sh (100%) diff --git a/Dockerfile.ce b/Dockerfile.ce index 0570f1e..2335470 100644 --- a/Dockerfile.ce +++ b/Dockerfile.ce @@ -24,7 +24,7 @@ RUN cmake --build /build --config Release --parallel 2 RUN cmake --install ./build --prefix /usr --verbose \ --config Release --component sourcemeta_registry -RUN make -C /source test PREFIX=/usr +RUN make -C /source test PREFIX=/usr ENTERPRISE=OFF FROM debian:bookworm-slim RUN apt-get --yes update && apt-get install --yes --no-install-recommends \ diff --git a/Dockerfile.ee b/Dockerfile.ee index 60dc29d..3422440 100644 --- a/Dockerfile.ee +++ b/Dockerfile.ee @@ -24,7 +24,7 @@ RUN cmake --build /build --config Release --parallel 2 RUN cmake --install ./build --prefix /usr --verbose \ --config Release --component sourcemeta_registry -RUN make -C /source test PREFIX=/usr +RUN make -C /source test PREFIX=/usr ENTERPRISE=ON FROM debian:bookworm-slim RUN apt-get --yes update && apt-get install --yes --no-install-recommends \ diff --git a/Makefile b/Makefile index ef37d31..cf952be 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,12 @@ lint: .PHONY: test test: - ./test/cli/index/no-options.sh $(PREFIX)/bin/sourcemeta-registry-index - ./test/cli/index/no-output.sh $(PREFIX)/bin/sourcemeta-registry-index - ./test/cli/index/invalid-configuration.sh $(PREFIX)/bin/sourcemeta-registry-index + ./test/cli/common/index/invalid-configuration.sh $(PREFIX)/bin/sourcemeta-registry-index +ifeq ($(ENTERPRISE), ON) +else + ./test/cli/ce/index/no-options.sh $(PREFIX)/bin/sourcemeta-registry-index + ./test/cli/ce/index/no-output.sh $(PREFIX)/bin/sourcemeta-registry-index +endif .PHONY: test-schemas test-schemas: diff --git a/test/cli/index/no-options.sh b/test/cli/ce/index/no-options.sh similarity index 100% rename from test/cli/index/no-options.sh rename to test/cli/ce/index/no-options.sh diff --git a/test/cli/index/no-output.sh b/test/cli/ce/index/no-output.sh similarity index 100% rename from test/cli/index/no-output.sh rename to test/cli/ce/index/no-output.sh diff --git a/test/cli/index/invalid-configuration.sh b/test/cli/common/index/invalid-configuration.sh similarity index 100% rename from test/cli/index/invalid-configuration.sh rename to test/cli/common/index/invalid-configuration.sh