diff --git a/.ci/docker.run b/.ci/docker.run index c45c8ad52..3c24d8d53 100755 --- a/.ci/docker.run +++ b/.ci/docker.run @@ -40,7 +40,7 @@ if [ "$GEN_FUZZ" == "1" ]; then ./configure --with-fuzzing=libfuzzer --enable-tcti-fuzzing \ --disable-tcti-device --disable-tcti-mssim --disable-tcti-swtpm \ --disable-shared --with-crypto="$WITH_CRYPTO" - make -j$(nproc) check + make -j check exit 0 fi @@ -57,7 +57,8 @@ echo "PWD: $(pwd)" echo "ls -la ../ $(ls -la ../)" ../configure --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS -make -j$(nproc) +make prepare-check +make -j popd if [ "$WITH_CRYPTO" == "none" ]; then @@ -80,14 +81,14 @@ if ldconfig -p 2>/dev/null| grep libasan > /dev/null && ldconfig -p 2>/dev/null| fi if [ "$SCANBUILD" == "yes" ]; then - scan-build --status-bugs ../configure --enable-unit --enable-self-generated-certificate --enable-integration --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS + scan-build --status-bugs ../configure --disable-unit --enable-self-generated-certificate --enable-integration --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS elif [ "$CC" == "clang" ]; then - ../configure --enable-unit --enable-self-generated-certificate --enable-integration --with-maxloglevel=none --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS + ../configure --disable-unit --enable-self-generated-certificate --enable-integration --with-maxloglevel=none --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS else if [ "$WITH_TCTI" == "mssim" ]; then - ../configure $SANITIZER_OPTION --disable-tcti-swtpm --enable-unit --enable-self-generated-certificate --enable-integration --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS + ../configure $SANITIZER_OPTION --disable-tcti-swtpm --disable-unit --enable-self-generated-certificate --enable-integration --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS else - ../configure $SANITIZER_OPTION --with-maxloglevel=none --enable-debug=yes --enable-unit --enable-self-generated-certificate --enable-integration --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS + ../configure $SANITIZER_OPTION --with-maxloglevel=none --enable-debug=yes --disable-unit --enable-self-generated-certificate --enable-integration --with-crypto=$WITH_CRYPTO $CONFIGURE_OPTIONS fi fi @@ -107,34 +108,34 @@ pushd ./config_test if [ "$CC" == "gcc" ]; then # No TCTI - expect to fail echo "========================== START TEST - NO TCTI ==========================" - (../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --disable-tcti-mssim --disable-tcti-device && exit 1) || echo "failed as expected"; + (../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --disable-tcti-mssim --disable-tcti-device && exit 1) || echo "failed as expected"; # only device TCTI echo "========================== START TEST - device TCTI ==========================" - mkdir -p ./dev/tpm0 && ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --disable-tcti-mssim --enable-tcti-device --with-device=./dev/tpm0 + mkdir -p ./dev/tpm0 && ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --disable-tcti-mssim --enable-tcti-device --with-device=./dev/tpm0 make -j check TESTS="test/unit/tcti-device" && rm -rf ./dev # only mssim TCTI echo "========================== START TEST - mssim TCTI ==========================" - ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --enable-tcti-mssim --disable-tcti-device + ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --enable-tcti-mssim --disable-tcti-device make -j check TESTS="test/unit/tcti-mssim" # device and mssim TCTIs echo "========================== START TEST - mssim & device TCTI ==========================" - ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --enable-tcti-mssim --enable-tcti-device + ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --disable-tcti-swtpm --enable-tcti-mssim --enable-tcti-device make -j check TESTS="test/unit/tcti-device test/unit/tcti-mssim" # only swtmp TCTI echo "========================== START TEST - swtpm TCTI ==========================" - ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --disable-tcti-mssim --disable-tcti-device + ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --disable-tcti-mssim --disable-tcti-device make -j check TESTS="test/unit/tcti-swtpm" # swtmp and device TCTIs echo "========================== START TEST - swtpm & device TCTI ==========================" - ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --disable-tcti-mssim --enable-tcti-device + ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --disable-tcti-mssim --enable-tcti-device make -j check TESTS="test/unit/tcti-swtpm test/unit/tcti-device" # swtmp and mssim TCTIs echo "========================== START TEST - swtpm & mssim TCTI ==========================" - ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --enable-tcti-mssim --disable-tcti-device + ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --enable-tcti-mssim --disable-tcti-device make -j check TESTS="test/unit/tcti-swtpm test/unit/tcti-mssim" # all TCTIs echo "========================== START TEST - swtpm & mssim & device TCTI ==========================" - ../configure --disable-doxygen-doc --enable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --enable-tcti-mssim --enable-tcti-device + ../configure --disable-doxygen-doc --disable-unit --enable-self-generated-certificate --enable-integration --enable-tcti-swtpm --enable-tcti-mssim --enable-tcti-device make -j check TESTS="test/unit/tcti-swtpm test/unit/tcti-mssim test/unit/tcti-device" fi # CC == gcc popd diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff15d89d8..eb509590b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,8 +7,8 @@ jobs: if: "!contains(github.ref, 'coverity_scan')" strategy: matrix: - docker_image: [ubuntu-20.04, fedora-32, opensuse-leap, ubuntu-22.04, alpine-3.15] - compiler: [gcc, clang] + docker_image: [ubuntu-20.04 ] + compiler: [gcc ] steps: - name: Check out repository uses: actions/checkout@v2 @@ -27,7 +27,7 @@ jobs: run: cat $(find ../ -name test-suite.log) || true scanbuild: runs-on: ubuntu-latest - if: "!contains(github.ref, 'coverity_scan')" + if: "contains(github.ref, 'coverity_scan')" steps: - name: Check out repository uses: actions/checkout@v2 @@ -46,7 +46,7 @@ jobs: run: cat $(find ../ -name test-suite.log) || true test-tcti-config: runs-on: ubuntu-latest - if: "!contains(github.ref, 'coverity_scan')" + if: "contains(github.ref, 'coverity_scan')" steps: - name: Check out repository uses: actions/checkout@v2 @@ -65,10 +65,10 @@ jobs: run: cat $(find ../ -name test-suite.log) || true test-mbedtls: runs-on: ubuntu-latest - if: "!contains(github.ref, 'coverity_scan')" + if: "contains(github.ref, 'coverity_scan')" strategy: matrix: - docker_image: [ubuntu-20.04, ubuntu-22.04-mbedtls-3.1] + docker_image: [ubuntu-20.04 ] steps: - name: Check out repository uses: actions/checkout@v2 @@ -87,7 +87,7 @@ jobs: run: cat $(find ../ -name test-suite.log) || true test-no-crypto-build: runs-on: ubuntu-latest - if: "!contains(github.ref, 'coverity_scan')" + if: "contains(github.ref, 'coverity_scan')" steps: - name: Check out repository uses: actions/checkout@v2 @@ -106,7 +106,7 @@ jobs: run: cat $(find ../ -name test-suite.log) || true test-coverage: runs-on: ubuntu-latest - if: "!contains(github.ref, 'coverity_scan')" + if: "contains(github.ref, 'coverity_scan')" steps: - name: Check out repository uses: actions/checkout@v2 @@ -125,7 +125,7 @@ jobs: run: cat $(find ../ -name test-suite.log) || true test-fuzz: runs-on: ubuntu-latest - if: "!contains(github.ref, 'coverity_scan')" + if: "contains(github.ref, 'coverity_scan')" steps: - name: Check out repository uses: actions/checkout@v2