From 576b135863cfe5b178a7125f56bf83e77ee27d97 Mon Sep 17 00:00:00 2001 From: Adam Getchell Date: Tue, 12 Dec 2023 17:11:31 -0800 Subject: [PATCH] Update HPC and PVS Studio scripts Also update version of vcpkg to c8696863d371ab7f46e213d8f5ca923c4aef2a00 in repo --- scripts/pvs-studio.sh | 2 +- scripts/slurm.sh | 2 +- tests/Ergodic_moves_3_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pvs-studio.sh b/scripts/pvs-studio.sh index 17c3e0784..17b680644 100755 --- a/scripts/pvs-studio.sh +++ b/scripts/pvs-studio.sh @@ -12,7 +12,7 @@ rm -rf build/ cmake --preset debug cmake --build build cd build || exit -pvs-studio-analyzer analyze -o pvsreport.log -j8 +pvs-studio-analyzer analyze -o pvsreport.log -e ../vcpkg_installed -j8 # Filter warning 521 pvs-studio-analyzer suppress -v521 pvsreport.log pvs-studio-analyzer filter-suppressed pvsreport.log diff --git a/scripts/slurm.sh b/scripts/slurm.sh index 65531de15..51139676b 100755 --- a/scripts/slurm.sh +++ b/scripts/slurm.sh @@ -4,7 +4,7 @@ # Or, interactively, # srun -p med2 -t 1-00 --mem=100G --ntasks 12 --pty /bin/bash -il module load spack/cmake -module load spack/gcc +module load gcc/13.2.0 module load spack/autoconf-archive cd .. rm -rf build/ diff --git a/tests/Ergodic_moves_3_test.cpp b/tests/Ergodic_moves_3_test.cpp index 1dab1a20e..7ca90aa36 100644 --- a/tests/Ergodic_moves_3_test.cpp +++ b/tests/Ergodic_moves_3_test.cpp @@ -516,7 +516,7 @@ SCENARIO("Test convenience functions needed for bistellar flip" * } SCENARIO("Perform bistellar flip on Delaunay triangulation" * - doctest::test_suite("ergodic") * doctest::skip()) + doctest::test_suite("ergodic")) { GIVEN("A triangulation setup for a bistellar flip") {