msg-filter: ignore version-release in kernel scripts

... `installed in usr/src/kernels/...+debug/scripts` Related: https://issues.redhat.com/browse/OSH-563
kdudka · Apr 10, 2024 · 0be43cc · 0be43cc
1 parent 608ffd4
commit 0be43cc
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 2 deletions.
diff --git a/src/lib/msg-filter.cc b/src/lib/msg-filter.cc
@@ -263,6 +263,11 @@ std::string MsgFilter::filterPath(const std::string &origPath) const
         return tmpPath;
     }
 
+    // "/usr/src/kernels/4.18.0-552.el8.x86_64+debug/..."
+    // -> "/usr/src/kernels/VERSION-RELEASE+debug/..."
+    const RE reKrnUsrSrc("^(/usr/src/kernels/)[^/-]+-[^/-]+((?:\\+debug)?/.*)$");
+    path = regexReplaceWrap(path, reKrnUsrSrc, "\\1VERSION-RELEASE\\2");
+
     boost::smatch sm;
     if (boost::regex_match(path, sm, d->rePyBuild)) {
         // %{_builddir}/build/lib/setuptools/glob.py ->

diff --git a/tests/csdiff/CMakeLists.txt b/tests/csdiff/CMakeLists.txt
@@ -84,5 +84,6 @@ test_csdiff(diff-misc 16-cov-parser-key-event)
 test_csdiff(diff-misc 17-cov-parser-key-event)
 test_csdiff(diff-misc 18-cov-parser-key-event)
 test_csdiff(diff-misc 19-cov-parser-key-event)
+test_csdiff(diff-misc 21-kernel-shell-code)
 
 add_subdirectory(filter-file)
diff --git a/tests/csdiff/diff-misc/21-kernel-shell-code-add-z.err b/tests/csdiff/diff-misc/21-kernel-shell-code-add-z.err
diff --git a/tests/csdiff/diff-misc/21-kernel-shell-code-add.err b/tests/csdiff/diff-misc/21-kernel-shell-code-add.err
diff --git a/tests/csdiff/diff-misc/21-kernel-shell-code-fix-z.err b/tests/csdiff/diff-misc/21-kernel-shell-code-fix-z.err
diff --git a/tests/csdiff/diff-misc/21-kernel-shell-code-fix.err b/tests/csdiff/diff-misc/21-kernel-shell-code-fix.err
diff --git a/tests/csdiff/diff-misc/21-kernel-shell-code-new.err b/tests/csdiff/diff-misc/21-kernel-shell-code-new.err
@@ -0,0 +1,23 @@
+Error: SHELLCHECK_WARNING (CWE-398):
+/usr/libexec/kselftests/drivers/net/netdevsim/ethtool-common.sh:31:8: error[SC1073]: Couldn't parse this test expression. Fix to allow more checks.
+#   29|       [ -z "$exp_fail" ] && cop="-ne" || cop="-eq"
+#   30|   
+#   31|->     if [ $code $cop 0 ]; then
+#   32|   	((num_errors++))
+#   33|   	return
+
+Error: SHELLCHECK_WARNING (CWE-398):
+/usr/src/kernels/4.18.0-552.el8.x86_64+debug/scripts/decode_stacktrace.sh:116:6: error[SC1073]: Couldn't parse this test expression. Fix to allow more checks.
+#  114|   
+#  115|   		# Format timestamps with tabs
+#  116|-> 		if [[ ${words[$i]} == \[ && ${words[$i+1]} == *\] ]]; then
+#  117|   			unset words[$i]
+#  118|   			words[$i+1]=$(printf "[%13s\n" "${words[$i+1]}")
+
+Error: SHELLCHECK_WARNING (CWE-398):
+/usr/src/kernels/4.18.0-552.el8.x86_64/scripts/decode_stacktrace.sh:116:6: error[SC1073]: Couldn't parse this test expression. Fix to allow more checks.
+#  114|   
+#  115|   		# Format timestamps with tabs
+#  116|-> 		if [[ ${words[$i]} == \[ && ${words[$i+1]} == *\] ]]; then
+#  117|   			unset words[$i]
+#  118|   			words[$i+1]=$(printf "[%13s\n" "${words[$i+1]}")
diff --git a/tests/csdiff/diff-misc/21-kernel-shell-code-old.err b/tests/csdiff/diff-misc/21-kernel-shell-code-old.err
@@ -0,0 +1,23 @@
+Error: SHELLCHECK_WARNING (CWE-398):
+/usr/libexec/kselftests/drivers/net/netdevsim/ethtool-common.sh:31:8: error[SC1073]: Couldn't parse this test expression. Fix to allow more checks.
+#   29|       [ -z "$exp_fail" ] && cop="-ne" || cop="-eq"
+#   30|   
+#   31|->     if [ $code $cop 0 ]; then
+#   32|   	((num_errors++))
+#   33|   	return
+
+Error: SHELLCHECK_WARNING (CWE-398):
+/usr/src/kernels/4.18.0-513.5.1.el8.x86_64+debug/scripts/decode_stacktrace.sh:116:6: error[SC1073]: Couldn't parse this test expression. Fix to allow more checks.
+#  114|   
+#  115|   		# Format timestamps with tabs
+#  116|-> 		if [[ ${words[$i]} == \[ && ${words[$i+1]} == *\] ]]; then
+#  117|   			unset words[$i]
+#  118|   			words[$i+1]=$(printf "[%13s\n" "${words[$i+1]}")
+
+Error: SHELLCHECK_WARNING (CWE-398):
+/usr/src/kernels/4.18.0-513.5.1.el8.x86_64/scripts/decode_stacktrace.sh:116:6: error[SC1073]: Couldn't parse this test expression. Fix to allow more checks.
+#  114|   
+#  115|   		# Format timestamps with tabs
+#  116|-> 		if [[ ${words[$i]} == \[ && ${words[$i+1]} == *\] ]]; then
+#  117|   			unset words[$i]
+#  118|   			words[$i+1]=$(printf "[%13s\n" "${words[$i+1]}")
diff --git a/tests/csdiff/diff-misc/sync.sh b/tests/csdiff/diff-misc/sync.sh
@@ -2,13 +2,14 @@
 set -x
 
 csdiff=$(realpath ../../../csdiff_build/src/csdiff)
+csgrep=$(realpath ../../../csdiff_build/src/csgrep)
 test -x "$csdiff" || exit $?
 
 for old in *-old.err; do
     test=${old%-old.err}
     new=${test}-new.err
     for args in "" "-z"; do
-        $csdiff $args $old $new | csgrep > ${test}-add${args}.err
-        $csdiff $args $new $old | csgrep > ${test}-fix${args}.err
+        $csdiff $args $old $new | $csgrep > ${test}-add${args}.err
+        $csdiff $args $new $old | $csgrep > ${test}-fix${args}.err
     done
 done