summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-10-22 09:29:28 +0200
committerThomas Haller <thaller@redhat.com>2020-10-22 09:29:28 +0200
commit6677480a2d50b75bdbb1170f4006b2f9fb100d6a (patch)
tree3152d61e4c63a45cf056299343e3b1b8c49bba04
parente55f0a278865af6528658724eeefb7613ec939b3 (diff)
checkpatch: ignore warning about g_assert*() also for files like "shared/nm-utils/nm-test-utils.h"
-rwxr-xr-xcontrib/scripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/scripts/checkpatch.pl b/contrib/scripts/checkpatch.pl
index 1729e96f8..c702810e2 100755
--- a/contrib/scripts/checkpatch.pl
+++ b/contrib/scripts/checkpatch.pl
@@ -188,7 +188,7 @@ complain ("Don't use space inside elvis operator ?:") if $line =~ /\?[\t ]+:/;
complain ("Don't add Emacs editor formatting hints to source files") if $line_no == 1 and $line =~ /-\*-.+-\*-/;
complain ("XXX marker are reserved for development while work-in-progress. Use TODO or FIXME comment instead?") if $line =~ /\bXXX\b/;
complain ("This gtk-doc annotation looks wrong") if $line =~ /\*.*\( *(transfer-(none|container|full)|allow none) *\) *(:|\()/;
-complain ("Prefer nm_assert() or g_return*() to g_assert*()") if $line =~ /g_assert/ and not $filename =~ /\/tests\//;
+complain ("Prefer nm_assert() or g_return*() to g_assert*()") if $line =~ /g_assert/ and (not $filename =~ /\/tests\//) and (not $filename =~ /\/nm-test-/);
complain ("Use gs_free_error with GError variables") if $line =~ /\bgs_free\b +GError *\*/;
#complain ("Use spaces instead of tabs") if $line =~ /\t/;