From ee328028a3f96e149a8435e5982c30cad1c9024d Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Thu, 21 Nov 2024 00:40:03 +0200 Subject: [PATCH] test(libcrypto): fix paths --- .../composite/unit-integration-test-runner/run-unit-tests.sh | 5 ----- core/Makefile | 2 +- cpp/posix_openssl.mk | 2 +- openssl/posix.mk | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/composite/unit-integration-test-runner/run-unit-tests.sh b/.github/workflows/composite/unit-integration-test-runner/run-unit-tests.sh index 1dbb8df5..80927afe 100755 --- a/.github/workflows/composite/unit-integration-test-runner/run-unit-tests.sh +++ b/.github/workflows/composite/unit-integration-test-runner/run-unit-tests.sh @@ -1,11 +1,6 @@ #!/bin/bash set -e -ls /usr/lib/x86_64-linux-gnu/libcrypto.* -echo "----" -ls /usr/include/openssl -echo "----" - echo "::group::Run unit tests ('$1' $CC / $CXX)" cd "$GITHUB_WORKSPACE/core" make clean generate_report diff --git a/core/Makefile b/core/Makefile index 155921a6..20aa9c61 100644 --- a/core/Makefile +++ b/core/Makefile @@ -105,7 +105,7 @@ else else # Path on GitHub Action Runner (ubuntu-latest image) ifeq ($(shell test -d "/usr/include/openssl" && echo yes || echo no),yes) - CRYPTO_INCLUDES += -I/usr/include/openssl + CRYPTO_INCLUDES += -I/usr/include endif endif # Path on GitHub Action Runner (ubuntu-latest image) diff --git a/cpp/posix_openssl.mk b/cpp/posix_openssl.mk index a1885afd..5fa51c7e 100644 --- a/cpp/posix_openssl.mk +++ b/cpp/posix_openssl.mk @@ -141,7 +141,7 @@ else else # Path on GitHub Action Runner (ubuntu-latest image) ifeq ($(shell test -d "/usr/include/openssl" && echo yes || echo no),yes) - CFLAGS += -I/usr/include/openssl + CFLAGS += -I/usr/include endif endif # Path on GitHub Action Runner (ubuntu-latest image) diff --git a/openssl/posix.mk b/openssl/posix.mk index 85a4586b..7b5a8c7a 100644 --- a/openssl/posix.mk +++ b/openssl/posix.mk @@ -148,7 +148,7 @@ else else # Path on GitHub Action Runner (ubuntu-latest image) ifeq ($(shell test -d "/usr/include/openssl" && echo yes || echo no),yes) - CFLAGS += -I/usr/include/openssl + CFLAGS += -I/usr/include endif endif # Path on GitHub Action Runner (ubuntu-latest image)