diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml index c4c78551e8..0471a099bb 100644 --- a/.github/workflows/static-checks.yaml +++ b/.github/workflows/static-checks.yaml @@ -116,5 +116,4 @@ jobs: cd src/dragonball /root/.cargo/bin/cargo version rustc --version - # TODO: Using the cargo command directly will get `sudo: cargo: command not found` error. - sudo -E /root/.cargo/bin/cargo test --all-features -- --nocapture + sudo -E env PATH=$PATH LIBC=gnu SUPPORT_VIRTUALIZATION=true make test diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile index 90ab19fc07..279d872bbc 100644 --- a/src/dragonball/Makefile +++ b/src/dragonball/Makefile @@ -13,7 +13,8 @@ else default: build build: - cargo build --all-features + @echo "INFO: cargo build..." + cargo build --all-features --target $(TRIPLE) check: clippy format @@ -34,6 +35,13 @@ clean: cargo clean test: - @echo "INFO: skip testing dragonball" +ifdef SUPPORT_VIRTUALIZATION + cargo test --all-features --target $(TRIPLE) -- --nocapture +else + @echo "INFO: skip testing dragonball, it need virtualization support." + exit 0 +endif endif # ifeq ($(ARCH), s390x) + +.DEFAULT_GOAL := default diff --git a/utils.mk b/utils.mk index a52bb7362d..bc4aa392c9 100644 --- a/utils.mk +++ b/utils.mk @@ -173,6 +173,7 @@ TRIPLE = $(ARCH)-unknown-linux-$(LIBC) CWD := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) standard_rust_check: + @echo "standard rust check..." cargo fmt -- --check cargo clippy --all-targets --all-features --release \ -- \