From ddc95af8de1ee136def6088fb0a1bbf2a11922c5 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Wed, 30 Aug 2023 17:50:46 -0500 Subject: [PATCH 01/22] lcov update --- Makefile | 2 +- doc/changelog.rst | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a92489e2f..d8ca16988 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ REDISAI_URL := https://github.com/RedisAI/RedisAI.git CATCH2_URL := https://github.com/catchorg/Catch2.git CATCH2_VER := v2.13.6 LCOV_URL := https://github.com/linux-test-project/lcov.git -LCOV_VER := v1.15 +LCOV_VER := v2.0 # Build variables NPROC := $(shell nproc 2>/dev/null || python -c "import multiprocessing as mp; print (mp.cpu_count())" 2>/dev/null || echo 4) diff --git a/doc/changelog.rst b/doc/changelog.rst index 71c335887..84264e893 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -8,6 +8,7 @@ To be released at some future point in time Description +- Updated the third-party lcov component - Reduced number of suppressed lint errors - Expanded documentation of aggregation lists - Updated third-party software dependencies to current versions @@ -22,6 +23,7 @@ Description Detailed Notes +- Updated lcov from version 1.15 to 2.0 (PR395_) - Refactor factory for ConfigOptions to avoid using protected member outside an instance (PR393_) - Added a new advanced topics documentation page with a section on aggregation lists (PR390_) - Updated pybind (2.10.3 => 2.11.1), hiredis (1.1.0 => 1.2.0), and redis++ (1.3.5 => 1.3.10) dependencies to current versions (PR389_) @@ -35,6 +37,7 @@ Detailed Notes - Deleted obsolete build and testing files that are no longer needed with the new build and test system (PR366_) - Reuse existing redis connection when mapping the Redis cluster (PR364_) +.. _PR395: https://github.com/CrayLabs/SmartRedis/pull/395 .. _PR393: https://github.com/CrayLabs/SmartRedis/pull/393 .. _PR390: https://github.com/CrayLabs/SmartRedis/pull/390 .. _PR389: https://github.com/CrayLabs/SmartRedis/pull/389 From 7ae21a4d18f396fcdee19f6ec122e64d7f339022 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 12:16:46 -0500 Subject: [PATCH 02/22] New install for LCOV --- .github/workflows/run_tests.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 04937744c..cbab936bd 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -167,7 +167,7 @@ jobs: # Process and upload code coverage (Python was collected during pytest) - name: Collect coverage from C/C++/Fortran testers - run: third-party/lcov/install/usr/local/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info + run: third-party/lcov/install/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/Makefile b/Makefile index d8ca16988..d6ede0e38 100644 --- a/Makefile +++ b/Makefile @@ -603,5 +603,5 @@ third-party/lcov/install/usr/local/bin/lcov: git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 @cd third-party/lcov && \ mkdir -p install && \ - CC=gcc CXX=g++ DESTDIR="install/" make install && \ + CC=gcc CXX=g++ make PREFIX=`pwd`/install/ install && \ echo "Finished installing LCOV" From 5ac83f1e6e50323f02cf561cdabb81fbdf878569 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 12:26:23 -0500 Subject: [PATCH 03/22] LCOV dependency fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d6ede0e38..144606991 100644 --- a/Makefile +++ b/Makefile @@ -596,8 +596,8 @@ third-party/catch/single_include/catch2/catch.hpp: # LCOV (hidden test target) .PHONY: lcov -lcov: third-party/lcov/install/usr/local/bin/lcov -third-party/lcov/install/usr/local/bin/lcov: +lcov: third-party/lcov/install/bin/lcov +third-party/lcov/install/bin/lcov: @mkdir -p third-party @cd third-party && \ git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 From 7c862001c5a1e92a27bf3c55e17eb05960dcf72f Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 12:50:55 -0500 Subject: [PATCH 04/22] Install Capture::Tiny prereq for LCOV --- .github/workflows/run_tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index cbab936bd..833481f99 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -117,7 +117,9 @@ jobs: run: python -m pip install -e .[dev,xarray] - name: Build and install test dependencies - run: make lcov && make catch2 + run: | + sudo perl -MCPAN -e 'install "Capture::Tiny"' + make lcov && make catch2 - name: Install docker, redis-server, and RedisAI run: | From 934d2e9a480a344011b4e4756b12f3a130fbee54 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 12:56:45 -0500 Subject: [PATCH 05/22] Fix syntax error --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 833481f99..1bb7e7348 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -118,7 +118,7 @@ jobs: - name: Build and install test dependencies run: | - sudo perl -MCPAN -e 'install "Capture::Tiny"' + sudo perl -MCPAN -e 'install "Capture::Tiny"' && \ make lcov && make catch2 - name: Install docker, redis-server, and RedisAI From db9e5917598776a0d21a9864423aa9b65cdb5c53 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 13:44:00 -0500 Subject: [PATCH 06/22] test --- .github/workflows/run_tests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 1bb7e7348..44c8e04bf 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -108,6 +108,14 @@ jobs: echo "CXX=icpx" >> $GITHUB_ENV && echo "FC=ifort" >> $GITHUB_ENV + # Set up perl environment for LCOV + - uses: actions/checkout@v3 + - name: Setup perl + uses: shogo82148/actions-setup-perl@1 + with: + perl-version: '5.30' + install-modules: Capture::Tiny + # Install additional dependencies - name: Install Cmake Linux if: contains(matrix.os, 'ubuntu') @@ -117,9 +125,7 @@ jobs: run: python -m pip install -e .[dev,xarray] - name: Build and install test dependencies - run: | - sudo perl -MCPAN -e 'install "Capture::Tiny"' && \ - make lcov && make catch2 + run: make lcov && make catch2 - name: Install docker, redis-server, and RedisAI run: | From 69701016d596650c9f9c436c1e98c5de1bdb9f67 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 13:47:36 -0500 Subject: [PATCH 07/22] test --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 44c8e04bf..0196ecd6d 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -111,7 +111,7 @@ jobs: # Set up perl environment for LCOV - uses: actions/checkout@v3 - name: Setup perl - uses: shogo82148/actions-setup-perl@1 + uses: shogo82148/actions-setup-perl@v1 with: perl-version: '5.30' install-modules: Capture::Tiny From d0bd478405861937a3f871e26822bf0c285eae47 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 14:03:18 -0500 Subject: [PATCH 08/22] test --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 0196ecd6d..efa8d4fac 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -114,7 +114,7 @@ jobs: uses: shogo82148/actions-setup-perl@v1 with: perl-version: '5.30' - install-modules: Capture::Tiny + install-modules: Capture::Tiny DateTime # Install additional dependencies - name: Install Cmake Linux From fe2f64f58ff196bbf2bfaf474d15964855d21625 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 15:40:49 -0500 Subject: [PATCH 09/22] test --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index efa8d4fac..82d4b8e3e 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -114,7 +114,7 @@ jobs: uses: shogo82148/actions-setup-perl@v1 with: perl-version: '5.30' - install-modules: Capture::Tiny DateTime + install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process Time::HiRes # Install additional dependencies - name: Install Cmake Linux From 2b1372ca4ffc8514dd4b614c0eef07aa78145cb5 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 15:55:54 -0500 Subject: [PATCH 10/22] test --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 82d4b8e3e..616ed1158 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -114,7 +114,7 @@ jobs: uses: shogo82148/actions-setup-perl@v1 with: perl-version: '5.30' - install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process Time::HiRes + install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process # Install additional dependencies - name: Install Cmake Linux From 96c42095da124b0297f655f58ee3ac074d2d8cad Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 16:29:29 -0500 Subject: [PATCH 11/22] test --- .github/workflows/run_tests.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 616ed1158..05201f90d 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -109,12 +109,14 @@ jobs: echo "FC=ifort" >> $GITHUB_ENV # Set up perl environment for LCOV - - uses: actions/checkout@v3 - - name: Setup perl - uses: shogo82148/actions-setup-perl@v1 - with: - perl-version: '5.30' - install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process + #- uses: actions/checkout@v3 + #- name: Setup perl + # uses: shogo82148/actions-setup-perl@v1 + # with: + # perl-version: '5.30' + # install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process + - name: Install LCOV + run: sudo apt-get install lcov=2.0 # Install additional dependencies - name: Install Cmake Linux @@ -125,7 +127,7 @@ jobs: run: python -m pip install -e .[dev,xarray] - name: Build and install test dependencies - run: make lcov && make catch2 + run: make catch2 #lcov && make catch2 - name: Install docker, redis-server, and RedisAI run: | @@ -175,7 +177,8 @@ jobs: # Process and upload code coverage (Python was collected during pytest) - name: Collect coverage from C/C++/Fortran testers - run: third-party/lcov/install/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info + #run: third-party/lcov/install/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info + run: lcov -c -d build/Coverage/CMakeFiles -o coverage.info - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From 6e7ee7ed2435e21f9d6f9e895167c841fe27ec30 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Thu, 31 Aug 2023 18:05:33 -0500 Subject: [PATCH 12/22] test --- .github/workflows/run_tests.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 05201f90d..82d4b8e3e 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -109,14 +109,12 @@ jobs: echo "FC=ifort" >> $GITHUB_ENV # Set up perl environment for LCOV - #- uses: actions/checkout@v3 - #- name: Setup perl - # uses: shogo82148/actions-setup-perl@v1 - # with: - # perl-version: '5.30' - # install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process - - name: Install LCOV - run: sudo apt-get install lcov=2.0 + - uses: actions/checkout@v3 + - name: Setup perl + uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: '5.30' + install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process Time::HiRes # Install additional dependencies - name: Install Cmake Linux @@ -127,7 +125,7 @@ jobs: run: python -m pip install -e .[dev,xarray] - name: Build and install test dependencies - run: make catch2 #lcov && make catch2 + run: make lcov && make catch2 - name: Install docker, redis-server, and RedisAI run: | @@ -177,8 +175,7 @@ jobs: # Process and upload code coverage (Python was collected during pytest) - name: Collect coverage from C/C++/Fortran testers - #run: third-party/lcov/install/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info - run: lcov -c -d build/Coverage/CMakeFiles -o coverage.info + run: third-party/lcov/install/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From c9b08b2194cf65b4ed67a22156dacfa7ac7d7048 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Fri, 1 Sep 2023 12:48:21 -0500 Subject: [PATCH 13/22] test --- .github/workflows/run_tests.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 82d4b8e3e..ca4deedb4 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -114,7 +114,18 @@ jobs: uses: shogo82148/actions-setup-perl@v1 with: perl-version: '5.30' - install-modules: Capture::Tiny DateTime Devel::Cover Digest::MD5 File::Spec JSON::XS Memory::Process Time::HiRes + + # Install additional perl Modules + - name: Add perl modules + run: | + sudo apt install libcapture-tiny-perl && \ + sudu apt install libdatetime-perl && \ + sudu apt install libdevel-cover-perl && \ + sudu apt install libdigest-md5-perl && \ + sudu apt install libfile-spec-perl && \ + sudu apt install libjson-xs-perl && \ + sudu apt install libmemory-process-perl && \ + sudu apt install libtime-hires-perl # Install additional dependencies - name: Install Cmake Linux From 16edbda648e8e0242bf0b04ef776a8ffdf6ea3d5 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Fri, 1 Sep 2023 13:00:31 -0500 Subject: [PATCH 14/22] test --- .github/workflows/run_tests.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index ca4deedb4..f7bfc38f6 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -119,13 +119,13 @@ jobs: - name: Add perl modules run: | sudo apt install libcapture-tiny-perl && \ - sudu apt install libdatetime-perl && \ - sudu apt install libdevel-cover-perl && \ - sudu apt install libdigest-md5-perl && \ - sudu apt install libfile-spec-perl && \ - sudu apt install libjson-xs-perl && \ - sudu apt install libmemory-process-perl && \ - sudu apt install libtime-hires-perl + sudo apt install libdatetime-perl && \ + sudo apt install libdevel-cover-perl && \ + sudo apt install libdigest-md5-perl && \ + sudo apt install libfile-spec-perl && \ + sudo apt install libjson-xs-perl && \ + sudo apt install libmemory-process-perl && \ + sudo apt install libtime-hires-perl # Install additional dependencies - name: Install Cmake Linux From 6015536b39790074819ecd738e1e0f4871219c57 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Fri, 1 Sep 2023 13:04:55 -0500 Subject: [PATCH 15/22] test --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index f7bfc38f6..91f1e38c0 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -114,6 +114,7 @@ jobs: uses: shogo82148/actions-setup-perl@v1 with: perl-version: '5.30' + install-modules: Memory::Process # Install additional perl Modules - name: Add perl modules @@ -124,7 +125,6 @@ jobs: sudo apt install libdigest-md5-perl && \ sudo apt install libfile-spec-perl && \ sudo apt install libjson-xs-perl && \ - sudo apt install libmemory-process-perl && \ sudo apt install libtime-hires-perl # Install additional dependencies From c25176d567b073bd0fa7d9410db04615b2f15e5f Mon Sep 17 00:00:00 2001 From: billschereriii Date: Wed, 6 Sep 2023 17:00:55 -0500 Subject: [PATCH 16/22] test --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 91f1e38c0..18d601e45 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -186,7 +186,7 @@ jobs: # Process and upload code coverage (Python was collected during pytest) - name: Collect coverage from C/C++/Fortran testers - run: third-party/lcov/install/bin/lcov -c -d build/Coverage/CMakeFiles -o coverage.info + run: third-party/lcov/install/bin/lcov --ignore-errors gcov,mismatch --keep-going -c -d build/Coverage/CMakeFiles -o coverage.info - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From dba3030feb08a746b837bd9587c39d0ac28614c2 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Mon, 18 Sep 2023 15:54:58 -0500 Subject: [PATCH 17/22] Merge and address Andrew's comment --- Makefile | 2 +- doc/changelog.rst | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 144606991..c0a9da5df 100644 --- a/Makefile +++ b/Makefile @@ -603,5 +603,5 @@ third-party/lcov/install/bin/lcov: git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 @cd third-party/lcov && \ mkdir -p install && \ - CC=gcc CXX=g++ make PREFIX=`pwd`/install/ install && \ + CC=gcc CXX=g++ make PREFIX=$(CURDIR)/install/ install && \ echo "Finished installing LCOV" diff --git a/doc/changelog.rst b/doc/changelog.rst index 6e9bb0181..edbcae888 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -1,6 +1,21 @@ Changelog ========= +Development branch +------------------ + +To be released at some future point in time + +Description + +- Updated the third-party lcov component + +Detailed Notes + +- Updated lcov from version 1.15 to 2.0 (PR395_) + +.. _PR395: https://github.com/CrayLabs/SmartRedis/pull/395 + 0.4.2 ----- @@ -8,7 +23,6 @@ Released on September 13, 2023 Description -- Updated the third-party lcov component - Reduced number of suppressed lint errors - Expanded documentation of aggregation lists - Updated third-party software dependencies to current versions @@ -23,7 +37,6 @@ Description Detailed Notes -- Updated lcov from version 1.15 to 2.0 (PR395_) - Refactor factory for ConfigOptions to avoid using protected member outside an instance (PR393_) - Added a new advanced topics documentation page with a section on aggregation lists (PR390_) - Updated pybind (2.10.3 => 2.11.1), hiredis (1.1.0 => 1.2.0), and redis++ (1.3.5 => 1.3.10) dependencies to current versions (PR389_) @@ -37,7 +50,6 @@ Detailed Notes - Deleted obsolete build and testing files that are no longer needed with the new build and test system (PR366_) - Reuse existing redis connection when mapping the Redis cluster (PR364_) -.. _PR395: https://github.com/CrayLabs/SmartRedis/pull/395 .. _PR393: https://github.com/CrayLabs/SmartRedis/pull/393 .. _PR390: https://github.com/CrayLabs/SmartRedis/pull/390 .. _PR389: https://github.com/CrayLabs/SmartRedis/pull/389 From 71a25746ba892b9033f5db8f1d8098670e4e4578 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Mon, 18 Sep 2023 17:30:50 -0500 Subject: [PATCH 18/22] test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c0a9da5df..f14aeb173 100644 --- a/Makefile +++ b/Makefile @@ -603,5 +603,5 @@ third-party/lcov/install/bin/lcov: git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 @cd third-party/lcov && \ mkdir -p install && \ - CC=gcc CXX=g++ make PREFIX=$(CURDIR)/install/ install && \ + CC=gcc CXX=g++ make PREFIX=$(PWD)/install/ install && \ echo "Finished installing LCOV" From 8aff9ee9c897707d141a0485ecbf9729e30058e1 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Mon, 18 Sep 2023 17:43:45 -0500 Subject: [PATCH 19/22] test --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f14aeb173..ba575542d 100644 --- a/Makefile +++ b/Makefile @@ -598,6 +598,7 @@ third-party/catch/single_include/catch2/catch.hpp: .PHONY: lcov lcov: third-party/lcov/install/bin/lcov third-party/lcov/install/bin/lcov: + @echo Installing LCOV @mkdir -p third-party @cd third-party && \ git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 From 184b1f8274eecfc95ef3c9c899d059ea7204ddf1 Mon Sep 17 00:00:00 2001 From: billschereriii Date: Mon, 18 Sep 2023 18:16:43 -0500 Subject: [PATCH 20/22] test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ba575542d..1cd29b229 100644 --- a/Makefile +++ b/Makefile @@ -604,5 +604,5 @@ third-party/lcov/install/bin/lcov: git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 @cd third-party/lcov && \ mkdir -p install && \ - CC=gcc CXX=g++ make PREFIX=$(PWD)/install/ install && \ + CC=gcc CXX=g++ make PREFIX=`pwd`/install/ install && \ echo "Finished installing LCOV" From f8d6f941a7840b5ca37596f6c8b8ebaf51442cbc Mon Sep 17 00:00:00 2001 From: billschereriii Date: Tue, 19 Sep 2023 11:10:32 -0500 Subject: [PATCH 21/22] test --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1cd29b229..dd62bada8 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ # General settings MAKEFLAGS += --no-print-directory SHELL:=/bin/bash +CWD := $(shell pwd) # Params for third-party software HIREDIS_URL := https://github.com/redis/hiredis.git @@ -604,5 +605,5 @@ third-party/lcov/install/bin/lcov: git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 @cd third-party/lcov && \ mkdir -p install && \ - CC=gcc CXX=g++ make PREFIX=`pwd`/install/ install && \ + CC=gcc CXX=g++ make PREFIX=$(CWD)/install/ install && \ echo "Finished installing LCOV" From 9b940b43ebc0de377357fbf418f937d7dcfd3e6e Mon Sep 17 00:00:00 2001 From: billschereriii Date: Tue, 19 Sep 2023 11:20:29 -0500 Subject: [PATCH 22/22] test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dd62bada8..3c709379b 100644 --- a/Makefile +++ b/Makefile @@ -605,5 +605,5 @@ third-party/lcov/install/bin/lcov: git clone $(LCOV_URL) lcov --branch $(LCOV_VER) --depth=1 @cd third-party/lcov && \ mkdir -p install && \ - CC=gcc CXX=g++ make PREFIX=$(CWD)/install/ install && \ + CC=gcc CXX=g++ make PREFIX=$(CWD)/third-party/lcov/install/ install && \ echo "Finished installing LCOV"