Fix tidy tests

TUM-I5 · Jul 8, 2024 · 6893034 · 6893034
1 parent 5334182
commit 6893034
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml
@@ -9,17 +9,21 @@ jobs:
     steps:
       - name: apt-get
         run: |
-          sudo apt-get update
-          sudo apt-get install hdf5-tools libeigen3-dev libhdf5-openmpi-103 libhdf5-openmpi-dev libmetis-dev libomp-dev libopenmpi-dev libparmetis-dev libyaml-cpp-dev openmpi-bin openmpi-common python3 python3-pip
+          sudo apt-get update -y
+          sudo apt-get install -y libomp-dev libopenmpi-dev openmpi-bin openmpi-common ninja-build
 
           # keep, for once clang-19 or higher is needed
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"
           sudo add-apt-repository "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"
-          sudo apt-get update
+          sudo apt-get update -y
 
           sudo apt-get -y install clang-18 clang-tidy-18 libomp-18-dev
 
+          sudo apt-get install -y software-properties-common
+          sudo add-apt-repository ppa:deadsnakes/ppa
+          sudo apt-get install -y cxxtest
+
           sudo pip3 install numpy
           sudo mkdir -p /opt/dependencies
 
@@ -35,5 +39,6 @@ jobs:
           git submodule update --init
           mkdir -p build && cd build
           cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DTESTING=ON
+          ninja
           sed -i 's/-fprofile-abs-path //g' compile_commands.json
           run-clang-tidy ../ ./ -clang-tidy-binary=$(which clang-tidy-18) -quiet -j $(nproc)
diff --git a/scripts/sanitizer.py b/scripts/sanitizer.py
@@ -130,7 +130,7 @@ def licenseHeader(authorspans, commentstyle = '//'):
         # TODO: unite year spans
         timespan = authorspans[author]
         crlines += [f'{commentstyle} SPDX-FileCopyrightText: {timespan} {author}']
-    return crlines + [f'{commentstyle} ', f'{commentstyle} SPDX-License-Identifier: {Settings.LICENSE}', '']
+    return crlines + [f'{commentstyle} ', f'{commentstyle} SPDX-License-Identifier: {Settings.LICENSE}']
 
 def makeLicense(path, copyrights, commentstyle = '//'):
     authorspans = {}

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -23,4 +23,4 @@ cxx_test( TestMathUtils ${CMAKE_CURRENT_SOURCE_DIR}/mathutils.t.h )
 cxx_test( TestPath ${CMAKE_CURRENT_SOURCE_DIR}/path.t.h )
 cxx_test( TestProgress ${CMAKE_CURRENT_SOURCE_DIR}/progress.t.h )
 cxx_test( TestStringUtils ${CMAKE_CURRENT_SOURCE_DIR}/stringutils.t.h )
-cxx_test( TestTimeUtils ${CMAKE_CURRENT_SOURCE_DIR}/timeutils.t.h )
+cxx_test( TestTimeUtils ${CMAKE_CURRENT_SOURCE_DIR}/timeutils.t.h )