From fd5dc92a2c9aa523287ddacf10f26fff1fa7e8c7 Mon Sep 17 00:00:00 2001 From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:50:53 -0500 Subject: [PATCH] Forgot to update CI/docs --- .github/workflows/sonarlint.yml | 2 +- CONTRIBUTING.md | 3 +-- ci/test-all-configs.py | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sonarlint.yml b/.github/workflows/sonarlint.yml index e609ff5..c8be50b 100644 --- a/.github/workflows/sonarlint.yml +++ b/.github/workflows/sonarlint.yml @@ -22,7 +22,7 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_BUILD_DEMO=On -DCPPTRACE_BUILD_TEST=On -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DCMAKE_CXX_STANDARD=11 + cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_BUILD_TESTING=On -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DCMAKE_CXX_STANDARD=11 make -j cd .. - name: Run sonar-scanner diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 04a5f7b..fc1938d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,8 +24,7 @@ Some useful configurations: - `-DCMAKE_BUILD_TYPE=Debug|Release|RelWithDebInfo`: Build in debug / release / etc. - `-DBUILD_SHARED_LIBS=On`: Build shared library - `-DCPPTRACE_SANITIZER_BUILD=On`: Turn on sanitizers -- `-DCPPTRACE_BUILD_TEST=On`: Build a small test program -- `-DCPPTRACE_BUILD_DEMO=On`: Build a small demo program +- `-DCPPTRACE_BUILD_TESTING=On`: Build small test and demo program ## Testing diff --git a/ci/test-all-configs.py b/ci/test-all-configs.py index 6b9d668..5396203 100644 --- a/ci/test-all-configs.py +++ b/ci/test-all-configs.py @@ -159,7 +159,7 @@ def build(matrix): f"-D{matrix['symbols']}=On", f"-D{matrix['demangle']}=On", "-DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/10/include/backtrace.h", - "-DCPPTRACE_BUILD_TEST=On" + "-DCPPTRACE_BUILD_TESTING=On" ] if matrix['symbols'] == "CPPTRACE_GET_SYMBOLS_WITH_LIBDL": args.append("-DCPPTRACE_BUILD_TEST_RDYNAMIC=On") @@ -178,7 +178,7 @@ def build(matrix): f"-D{matrix['unwind']}=On", f"-D{matrix['symbols']}=On", f"-D{matrix['demangle']}=On", - "-DCPPTRACE_BUILD_TEST=On" + "-DCPPTRACE_BUILD_TESTING=On" ] if matrix["compiler"] == "g++": args.append("-GUnix Makefiles") @@ -201,7 +201,7 @@ def build_full_or_auto(matrix): f"-DCMAKE_CXX_STANDARD={matrix['std']}", f"-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On", f"-DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/10/include/backtrace.h", - "-DCPPTRACE_BUILD_TEST=On" + "-DCPPTRACE_BUILD_TESTING=On" ] if matrix["config"] != "": args.append(f"{matrix['config']}") @@ -217,7 +217,7 @@ def build_full_or_auto(matrix): f"-DCMAKE_C_COMPILER={get_c_compiler_counterpart(matrix['compiler'])}", f"-DCMAKE_CXX_STANDARD={matrix['std']}", f"-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On", - "-DCPPTRACE_BUILD_TEST=On" + "-DCPPTRACE_BUILD_TESTING=On" ] if matrix["config"] != "": args.append(f"{matrix['config']}")