From 389d70bfebeeb69a6b148783b9ec2f4b4a099f34 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 4 Jan 2025 23:24:51 +0100 Subject: [PATCH] cmake: tidy up `-j` make option in integration tests (#1509) --- .github/workflows/ci.yml | 1 + tests/cmake/test.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28b2e3cd..9430af32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,7 @@ jobs: timeout-minutes: 60 env: CC: clang + MAKEFLAGS: -j5 steps: - uses: actions/checkout@v4 - name: 'cmake' diff --git a/tests/cmake/test.sh b/tests/cmake/test.sh index 0d675cab..43fec1f0 100755 --- a/tests/cmake/test.sh +++ b/tests/cmake/test.sh @@ -11,20 +11,20 @@ cd "$(dirname "$0")" rm -rf bld-fetchcontent; cmake -B bld-fetchcontent -DTEST_INTEGRATION_MODE=FetchContent \ -DFROM_GIT_REPO="${PWD}/../.." \ -DFROM_GIT_TAG="$(git rev-parse HEAD)" -make -j3 -C bld-fetchcontent +make -C bld-fetchcontent rm -rf libssh2; ln -s ../.. libssh2 rm -rf bld-add_subdirectory; cmake -B bld-add_subdirectory -DTEST_INTEGRATION_MODE=add_subdirectory -make -j3 -C bld-add_subdirectory +make -C bld-add_subdirectory rm -rf bld-libssh2; cmake ../.. -B bld-libssh2 -make -j3 -C bld-libssh2 DESTDIR=pkg install +make -C bld-libssh2 DESTDIR=pkg install rm -rf bld-find_package; cmake -B bld-find_package -DTEST_INTEGRATION_MODE=find_package \ -DCMAKE_PREFIX_PATH="${PWD}/bld-libssh2/pkg/usr/local/lib/cmake/libssh2" -make -j3 -C bld-find_package +make -C bld-find_package (cd ../..; git archive --format=tar HEAD) | gzip > source.tar.gz rm -rf bld-externalproject; cmake -B bld-externalproject -DTEST_INTEGRATION_MODE=ExternalProject \ -DFROM_ARCHIVE="${PWD}/source.tar.gz" \ -DFROM_HASH="$(openssl dgst -sha256 source.tar.gz | grep -a -i -o -E '[0-9a-f]{64}$')" -make -j3 -C bld-externalproject +make -C bld-externalproject