Merge remote-tracking branch 'origin/topic/awelzel/fix-bsd-3-license'

* origin/topic/awelzel/fix-bsd-3-license: tests: canonify-template-info for more versions Add Ignore lines to btest.cfg license: Fix bsd-3 license word split
zeek · Sep 5, 2023 · aa2d1dd · aa2d1dd
2 parents 312b2de + 6dc2219
commit aa2d1dd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/features/license/bsd-3 b/features/license/bsd-3
@@ -7,11 +7,11 @@ are permitted provided that the following conditions are met:
    list of conditions and the following disclaimer.
 
 2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following discla imer in the documentation
+   this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
 
 3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products deri ved from this software
+   may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

diff --git a/tests/Baseline/features.license-3/test.COPYING b/tests/Baseline/features.license-3/test.COPYING
@@ -8,11 +8,11 @@ are permitted provided that the following conditions are met:
    list of conditions and the following disclaimer.
 
 2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following discla imer in the documentation
+   this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
 
 3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products deri ved from this software
+   may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

diff --git a/tests/Baseline/features.template-info/output b/tests/Baseline/features.template-info/output
@@ -13,4 +13,4 @@ user vars:
 	unit_resp: name of the top-level Spicy parsing unit for the responder side of the connection (e.g. "Reply"); may be the same as originator side, no default, used by spicy-protocol-analyzer
 	author: AUTHOR
 	license: one of apache, bsd-2, bsd-3, mit, mpl-2, no default, used by license
-versions: v0.99.0, v1.0.0, v2.0.0
+version: VERSIONS
diff --git a/tests/btest.cfg b/tests/btest.cfg
@@ -1,7 +1,8 @@
 [btest]
 MinVersion = 0.66
-
 TestDirs = features
+IgnoreDirs  = .svn CVS .tmp
+IgnoreFiles = *.tmp *.swp .clang-format #* *.trace .DS_Store
 
 [environment]
 SCRIPTS = %(testbase)s/scripts

diff --git a/tests/scripts/canonify-template-info.sh b/tests/scripts/canonify-template-info.sh
@@ -2,4 +2,6 @@
 
 cat |
     sed 's/author:.*/author: AUTHOR/' |
-    sed 's/origin:.*/origin: ORIGIN/'
+    sed 's/origin:.*/origin: ORIGIN/' |
+    # versions: v0.99.0, v1.0.0, v2.0.0
+    sed -r 's/versions: (v[.0-9]+(, )?)+/version: VERSIONS/'