- Skip the 00-lint test. splint is not maintained; it either does not

  work or produces false positives. Static analysis is handled in the
  clang test.

diff --git a/doc/Changelog b/doc/Changelog
index befbfcaab4d6a7d64013cebe5d21989f8703f271..41fe08450fe2e226bdaf3ff91acc6647cd14c1bb 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,9 @@
        - Code cleanup for sldns_str2wire_svcparam_key_lookup.
        - Merge #802: add validation EDEs to queries where the CD bit is set.
        - For #802: Cleanup comments and add RCODE check for CD bit test case.
+       - Skip the 00-lint test. splint is not maintained; it either does not
+         work or produces false positives. Static analysis is handled in the
+         clang test.
 
 3 July 2023: Wouter
        - Fix #906: warning: ‘Py_SetProgramName’ is deprecated.

diff --git a/testdata/00-lint.tdir/00-lint.dsc b/testdata/00-lint.tdir/00-lint.dsc
index 4778f7a81ba510f7b2268f794038cbb85f600460..814a53717d90dea8325ebcdca2791d521ad1325a 100644 (file)
--- a/testdata/00-lint.tdir/00-lint.dsc
+++ b/testdata/00-lint.tdir/00-lint.dsc
@@ -3,14 +3,14 @@ Version: 1.0
 Description: Put source into lint.
 CreationDate: Wed Jan  3 14:12:02 CET 2007
 Maintainer: dr. W.C.A. Wijngaards
-Category: 
+Category:
 Component:
-CmdDepends: 
-Depends: 
+CmdDepends:
+Depends:
 Help:
-Pre:
+Pre: 00-lint.pre
 Post:
 Test: 00-lint.test
-AuxFiles: 
+AuxFiles:
 Passed:
 Failure:

diff --git a/testdata/00-lint.tdir/00-lint.pre b/testdata/00-lint.tdir/00-lint.pre
new file mode 100644 (file)
index 0000000..507f5e1
--- /dev/null
+++ b/testdata/00-lint.tdir/00-lint.pre
@@ -0,0 +1,14 @@
+# #-- 00-lint.pre--#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+. ../common.sh
+PRE="../.."
+
+if test -f $PRE/unbound_test_00-lint ; then
+    echo test enabled
+else
+    skip_test "test skipped; clang linter preferred over splint"
+fi