Merge "fix(tools): allow Cmake 3.16 to run static checks" into integr…

…ation
TF-RMM · Dec 8, 2022 · 35f487b · 35f487b
2 parents 0f4441d + af203f0
commit 35f487b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/tools/checkincludes/CheckIncludes.cmake b/tools/checkincludes/CheckIncludes.cmake
@@ -84,10 +84,13 @@ function(run_checkincludes source_files errors_ret)
     COMMAND ${CHECKINCLUDES_EXECUTABLE} ${source_files}
     OUTPUT_VARIABLE checkincludes_output
     RESULT_VARIABLE checkincludes_rc
-    ECHO_OUTPUT_VARIABLE
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
+  if(checkincludes_output)
+    message(${checkincludes_output})
+  endif()
+
   # checkincludes failed for this file. Collect no.of errors
   if(${checkincludes_rc} GREATER 0)
     checkincludes_get_stats("${checkincludes_output}" errors)
@@ -145,8 +148,10 @@ if(CHECKINCLUDES_PATCH)
     set(source_files "")
     filter_source_files("${files_in_commit}" source_files)
 
-    run_checkincludes("${source_files}" errors)
-    MATH(EXPR total_errors "${total_errors}+${errors}")
+    if(source_files)
+      run_checkincludes("${source_files}" errors)
+      MATH(EXPR total_errors "${total_errors}+${errors}")
+    endif()
   endforeach()
 
   print_stats_and_exit("checkincludes-patch" ${total_errors})

diff --git a/tools/checkpatch/CheckPatch.cmake b/tools/checkpatch/CheckPatch.cmake
@@ -147,9 +147,12 @@ if(CHECKPATCH_RUN)
       COMMAND ${CHECKPATCH_EXECUTABLE} -
       OUTPUT_VARIABLE checkpatch_output
       RESULT_VARIABLE checkpatch_rc
-      ECHO_OUTPUT_VARIABLE
       )
 
+    if(checkpatch_output)
+      message(${checkpatch_output})
+    endif()
+
     # checkpatch.pl failed for this commit. Collect no.of errors and warnings
     if(${checkpatch_rc})
       checkpatch_get_stats("${checkpatch_output}" errors warnings)

diff --git a/tools/checkspdx/CheckSPDX.cmake b/tools/checkspdx/CheckSPDX.cmake
@@ -76,10 +76,13 @@ function(run_checkspdx source_files errors_ret)
     COMMAND ${CHECKSPDX_EXECUTABLE} -r docs/readme.rst ${source_files}
     OUTPUT_VARIABLE checkspdx_output
     RESULT_VARIABLE checkspdx_rc
-    ECHO_OUTPUT_VARIABLE
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
+  if(checkspdx_output)
+    message(${checkspdx_output})
+  endif()
+
   # checkspdx failed for this file. Collect no.of errors
   if(${checkspdx_rc} GREATER 0)
     checkspdx_get_stats("${checkspdx_output}" errors)
@@ -141,8 +144,11 @@ if(CHECKSPDX_PATCH)
       list(FILTER source_files EXCLUDE REGEX "${exclude}")
     endforeach()
 
-    run_checkspdx("${source_files}" errors)
-    MATH(EXPR total_errors "${total_errors}+${errors}")
+    # run check if the list is not empty
+    if(source_files)
+      run_checkspdx("${source_files}" errors)
+      MATH(EXPR total_errors "${total_errors}+${errors}")
+    endif()
   endforeach()
 
   print_stats_and_exit("checkspdx-patch" ${total_errors})