From 9a6e4b319ba6c60ed82eaae7ce0a2e9a34d5501e Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 5 Sep 2023 10:06:55 +0200 Subject: [PATCH 1/3] license: Fix bsd-3 license word split --- features/license/bsd-3 | 4 ++-- tests/Baseline/features.license-3/test.COPYING | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/features/license/bsd-3 b/features/license/bsd-3 index 02d3d2e..f4d2b6b 100644 --- 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 index f75d523..ddf2f93 100644 --- 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 From 023d2bfb9cd11419af8bf3d02d4f5c97f352f76b Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 5 Sep 2023 10:22:03 +0200 Subject: [PATCH 2/3] Add Ignore lines to btest.cfg --- tests/btest.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/btest.cfg b/tests/btest.cfg index 8ee579d..5e67d85 100644 --- 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 From 6dc22194d3895d42f3ff88a6055cc6f41cade89c Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Tue, 5 Sep 2023 10:24:17 +0200 Subject: [PATCH 3/3] tests: canonify-template-info for more versions Oh, baseline joy. --- tests/Baseline/features.template-info/output | 2 +- tests/scripts/canonify-template-info.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Baseline/features.template-info/output b/tests/Baseline/features.template-info/output index 947f76e..72f34c7 100644 --- 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/scripts/canonify-template-info.sh b/tests/scripts/canonify-template-info.sh index 7a112e8..d407d3a 100755 --- 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/'