Skip to content

Commit

Permalink
Makefile: adjust default target, broaden all target
Browse files Browse the repository at this point in the history
Previously the default target ('all') built the rustls-ffi static
library and the client/server example binaries.

This commit adds a new default target ('default') that only builds the
static lib. It also updates 'all' to include integration and
connect-tests to truly be all the things.
  • Loading branch information
cpu committed Oct 4, 2024
1 parent 51ac465 commit 58bb1f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Build release binaries
run: |
make clean
make CC=${{ matrix.cc }} CRYPTO_PROVIDER=${{ matrix.crypto }} PROFILE=release
make CC=${{ matrix.cc }} CRYPTO_PROVIDER=${{ matrix.crypto }} PROFILE=release test
- name: Verify release builds were not using ASAN
if: runner.os == 'Linux' # For 'nm'
run: |
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ ifeq ($(COMPRESSION), true)
LDFLAGS += -lm
endif

all: target/client target/server
default: target/$(PROFILE)/librustls_ffi.a

test: all
all: default test integration connect-test

test: target/client target/server
${CARGO} test ${CARGOFLAGS}

integration: all
integration: test
${CARGO} test ${CARGOFLAGS} -- --ignored

connect-test: target/client
Expand Down Expand Up @@ -97,4 +99,4 @@ format-check:
cargo fmt --check
sed -i -e 's/if true {/ffi_panic_boundary! {/g' src/*.rs

.PHONY: all clean test integration format format-check
.PHONY: default all clean test integration format format-check

0 comments on commit 58bb1f0

Please sign in to comment.