Skip to content

CI: run nginx-tests in selected jobs #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2025
Merged

CI: run nginx-tests in selected jobs #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1abf752
Make: add "full-test" target to run NGINX test suite.
bavshin-f5 Aug 21, 2025
d655dff
CI: run "full-test" in selected jobs.
bavshin-f5 Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ jobs:
nginx-ref: stable-1.28
build: debug

env:
testTarget: >-
${{ (matrix.nginx-ref == 'stable-1.28' && matrix.build == 'debug')
&& 'full-test'
|| 'test'
}}

runs-on: ${{ matrix.runner }}-latest

steps:
Expand All @@ -73,8 +80,6 @@ jobs:
with:
repository: 'nginx/nginx-tests'
path: 'nginx/tests'
sparse-checkout: |
lib

- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
with:
Expand Down Expand Up @@ -117,4 +122,4 @@ jobs:
- name: run tests
# always run if build succeeds
if: ${{ !cancelled() && steps.build.outcome == 'success' }}
run: make BUILD=${{ matrix.build }} TEST_PREREQ= test
run: make BUILD=${{ matrix.build }} TEST_PREREQ= ${{ env.testTarget }}
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ unittest: $(NGINX_BUILD_DIR)/Makefile ## Run unit-tests
$(BUILD_ENV) $(NGX_CARGO) test

test: $(TEST_PREREQ) ## Run the integration test suite
env $(TEST_ENV) prove -I $(NGINX_TESTS_DIR)/lib --state=save $(TESTS) ||\
env $(TEST_ENV) prove -I $(NGINX_TESTS_DIR)/lib -v $(TESTS)

full-test: $(TEST_PREREQ) ## Run the module and NGINX integration test suites
env $(TEST_ENV) prove -I $(NGINX_TESTS_DIR)/lib --state=save \
-j $(TEST_JOBS) $(TESTS) $(NGINX_TESTS_DIR) ||\
env $(TEST_ENV) prove -I $(NGINX_TESTS_DIR)/lib --state=failed -v

clean: ## Cleanup everything
Expand Down
1 change: 1 addition & 0 deletions build/compat-gnu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
HOST_TUPLE := $(shell $(NGX_CARGO) -vV | awk '/^host: / { print $$2; }')
TEST_JOBS := $(shell nproc 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)

# extension for Rust cdylib targets
ifeq ($(shell uname), Darwin)
Expand Down
1 change: 1 addition & 0 deletions build/compat-posix.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
HOST_TUPLE != $(NGX_CARGO) -vV | awk '/^host: / { print $$2; }'
TEST_JOBS != nproc 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1

# bsd make compatibility
CURDIR ?= $(.CURDIR)
Expand Down
Loading