Merge pull request #5929 from tautschnig/fix-cpplint-action

Make cpplint check actually work in CI

Author: NlightNFotis

.github/workflows/pull-request-checks.yaml

@@ -364,7 +364,8 @@ jobs:
           # user input
           DEBIAN_FRONTEND: noninteractive
         run: |
-          pip install unidiff
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends -yq python3-unidiff
       - name: Check updated lines of code meet linting standards
         env:
           BASE_BRANCH: ${{ github.base_ref }}

regression/CMakeLists.txt

@@ -72,6 +72,7 @@ add_subdirectory(validate-trace-xml-schema)
 add_subdirectory(cbmc-primitives)
 add_subdirectory(goto-interpreter)
 add_subdirectory(cbmc-sequentialization)
+add_subdirectory(cpp-linter)
 
 if(WITH_MEMORY_ANALYZER)
   add_subdirectory(snapshot-harness)

regression/Makefile

@@ -45,6 +45,7 @@ DIRS = cbmc \
        cbmc-primitives \
        goto-interpreter \
        cbmc-sequentialization \
+			 cpp-linter \
        # Empty last line
 
 ifeq ($(OS),Windows_NT)

regression/cpp-linter/CMakeLists.txt

@@ -0,0 +1 @@
+add_test_pl_tests("../../../scripts/cpplint.py")

regression/cpp-linter/Makefile

@@ -1,10 +1,10 @@
 default: tests.log
 
 test:
-	@../test.pl -p -c "python ../../../scripts/cpplint.py"
+	@../test.pl -p -c ../../../scripts/cpplint.py
 
 tests.log: ../test.pl
-	@../test.pl -p -c "python ../../../scripts/cpplint.py"
+	@../test.pl -p -c ../../../scripts/cpplint.py
 
 show:
 	@for dir in *; do \

regression/cpp-linter/assert/module_dependencies.txt

@@ -1,6 +1,7 @@
 CORE
 main.cpp
 
-^main\.cpp:8:  assert is deprecated, use INVARIANT instead  \[build/deprecated\] \[4\]
-^Total errors found: 1$
+^regression/cpp-linter/assert/main\.cpp:8:  assert is deprecated, use UNREACHABLE instead  \[build/deprecated\] \[4\]
+^# Total errors found: 1$
+^EXIT=1$
 ^SIGNAL=0$

regression/cpp-linter/assert/test.desc

@@ -6,13 +6,14 @@ Author: Thomas Kiley, [email protected]
 
 \*******************************************************************/
 
+// clang-format off
 class temp_classt : public base_classt
 {}
 
-class another_class : public base_classt
+class another_class: public base_classt
 {}
 
-class more_class:public base_classt
+class more_class: public base_classt
 {}
 
 class nonderived
@@ -41,3 +42,4 @@ class testt
   template<class U>
   void bar(U t);
 }
+// clang-format on