summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-11-09 13:23:58 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-11-09 13:23:58 +0900
commitdb9ecf050165fd1033c6f81485917e229c4be537 (patch)
tree68a1e401823fc90fddae82e8858738b026ab8f89 /test
parent21d8f2533db7c46b80f74bd147869eb4f10195a6 (diff)
downloadsystemd-db9ecf050165fd1033c6f81485917e229c4be537.tar.gz
license: LGPL-2.1+ -> LGPL-2.1-or-later
Diffstat (limited to 'test')
-rwxr-xr-xtest/create-sys-script.py4
-rw-r--r--test/fuzz/fuzz-catalog/systemd.pl.catalog2
-rw-r--r--test/fuzz/fuzz-link-parser/99-default.link2
-rw-r--r--test/fuzz/fuzz-udev-rules/99-systemd.rules2
-rw-r--r--test/fuzz/fuzz-unit-file/machine.slice2
-rw-r--r--test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount2
-rw-r--r--test/fuzz/fuzz-unit-file/syslog.socket2
-rw-r--r--test/fuzz/fuzz-unit-file/systemd-ask-password-console.path2
-rw-r--r--test/fuzz/fuzz-unit-file/systemd-machined.service2
-rw-r--r--test/fuzz/fuzz-unit-file/systemd-resolved.service2
-rw-r--r--test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer2
-rw-r--r--test/fuzz/fuzz-unit-file/timers.target2
-rw-r--r--test/fuzz/fuzz-unit-file/var-lib-machines.mount2
-rw-r--r--test/fuzz/meson.build2
-rwxr-xr-xtest/hwdb-test.sh2
-rw-r--r--test/meson.build2
-rwxr-xr-xtest/networkd-test.py2
-rwxr-xr-xtest/rule-syntax-check.py2
-rwxr-xr-xtest/sys-script.py2
-rwxr-xr-xtest/sysv-generator-test.py2
-rwxr-xr-xtest/test-exec-deserialization.py2
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py2
-rw-r--r--test/test-path/basic.target2
-rw-r--r--test/test-path/paths.target2
-rw-r--r--test/test-path/sysinit.target2
-rw-r--r--test/units/basic.target2
-rw-r--r--test/units/shutdown.target2
-rw-r--r--test/units/sockets.target2
-rw-r--r--test/units/sysinit.target2
-rw-r--r--test/units/timers.target2
30 files changed, 31 insertions, 31 deletions
diff --git a/test/create-sys-script.py b/test/create-sys-script.py
index d03ca2cbf9..11ed185de0 100755
--- a/test/create-sys-script.py
+++ b/test/create-sys-script.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
OUTFILE_HEADER = """#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# create-sys-script.py
#
diff --git a/test/fuzz/fuzz-catalog/systemd.pl.catalog b/test/fuzz/fuzz-catalog/systemd.pl.catalog
index e0b582d4f2..043627c739 100644
--- a/test/fuzz/fuzz-catalog/systemd.pl.catalog
+++ b/test/fuzz/fuzz-catalog/systemd.pl.catalog
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
# Message catalog for systemd's own messages
# Polish translation
diff --git a/test/fuzz/fuzz-link-parser/99-default.link b/test/fuzz/fuzz-link-parser/99-default.link
index 92fcbe83ea..feb5b1fbb0 100644
--- a/test/fuzz/fuzz-link-parser/99-default.link
+++ b/test/fuzz/fuzz-link-parser/99-default.link
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-udev-rules/99-systemd.rules b/test/fuzz/fuzz-udev-rules/99-systemd.rules
index 6ae9898103..b6a5c5ad55 100644
--- a/test/fuzz/fuzz-udev-rules/99-systemd.rules
+++ b/test/fuzz/fuzz-udev-rules/99-systemd.rules
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/machine.slice b/test/fuzz/fuzz-unit-file/machine.slice
index bf8c6bfc3e..3fad2da42e 100644
--- a/test/fuzz/fuzz-unit-file/machine.slice
+++ b/test/fuzz/fuzz-unit-file/machine.slice
@@ -1,5 +1,5 @@
slice
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount b/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
index 777a123ef4..371469d832 100644
--- a/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
+++ b/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
@@ -1,5 +1,5 @@
automount
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/syslog.socket b/test/fuzz/fuzz-unit-file/syslog.socket
index 2eb316fcaa..969ee428fa 100644
--- a/test/fuzz/fuzz-unit-file/syslog.socket
+++ b/test/fuzz/fuzz-unit-file/syslog.socket
@@ -1,5 +1,5 @@
socket
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path b/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
index 3e12c752de..7eca92d219 100644
--- a/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
+++ b/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
@@ -1,5 +1,5 @@
path
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/systemd-machined.service b/test/fuzz/fuzz-unit-file/systemd-machined.service
index 79ee9861d8..45c64bae1c 100644
--- a/test/fuzz/fuzz-unit-file/systemd-machined.service
+++ b/test/fuzz/fuzz-unit-file/systemd-machined.service
@@ -1,5 +1,5 @@
service
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/systemd-resolved.service b/test/fuzz/fuzz-unit-file/systemd-resolved.service
index 0854c5f841..42c5c9a067 100644
--- a/test/fuzz/fuzz-unit-file/systemd-resolved.service
+++ b/test/fuzz/fuzz-unit-file/systemd-resolved.service
@@ -1,5 +1,5 @@
service
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer b/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
index 7db361cd69..d3d17dc535 100644
--- a/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
+++ b/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
@@ -1,5 +1,5 @@
timer
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
[Unit]
Description=Daily Cleanup of Temporary Directories
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
diff --git a/test/fuzz/fuzz-unit-file/timers.target b/test/fuzz/fuzz-unit-file/timers.target
index 171226c680..29d04c0f4c 100644
--- a/test/fuzz/fuzz-unit-file/timers.target
+++ b/test/fuzz/fuzz-unit-file/timers.target
@@ -1,5 +1,5 @@
target
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/fuzz-unit-file/var-lib-machines.mount b/test/fuzz/fuzz-unit-file/var-lib-machines.mount
index 9c257d1191..b2a491d447 100644
--- a/test/fuzz/fuzz-unit-file/var-lib-machines.mount
+++ b/test/fuzz/fuzz-unit-file/var-lib-machines.mount
@@ -1,5 +1,5 @@
mount
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index 99584c144b..772e07e7fc 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
# The 'optimization' option was introduced in meson 0.48.0, so let's keep
# the code compatible with older versions as well
diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh
index 8b909f7d80..2b54a0e70f 100755
--- a/test/hwdb-test.sh
+++ b/test/hwdb-test.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# Call built systemd-hwdb update on our hwdb files to ensure that they parse
# without error
diff --git a/test/meson.build b/test/meson.build
index 5656abdf72..cc461febf1 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
if install_tests
testdata_dir = testsdir + '/testdata/'
diff --git a/test/networkd-test.py b/test/networkd-test.py
index 4116995f8c..8496ec881c 100755
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# networkd integration test
# This uses temporary configuration in /run and temporary veth devices, and
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index 658b9459a9..9a9e4d1658 100755
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# Simple udev rules syntax checker
#
diff --git a/test/sys-script.py b/test/sys-script.py
index a51112603e..3f88fb5dfc 100755
--- a/test/sys-script.py
+++ b/test/sys-script.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# sys-script.py
#
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 3d9c1ddb87..484b610a02 100755
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# systemd-sysv-generator integration test
#
diff --git a/test/test-exec-deserialization.py b/test/test-exec-deserialization.py
index 8aa16fb7f9..9491e4081e 100755
--- a/test/test-exec-deserialization.py
+++ b/test/test-exec-deserialization.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# Copyright © 2017 Michal Sekletar <msekleta@redhat.com>
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 46c4bb7a95..1062f93e55 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
# systemd-networkd tests
import argparse
diff --git a/test/test-path/basic.target b/test/test-path/basic.target
index 4f44292249..d8cdd5ac14 100644
--- a/test/test-path/basic.target
+++ b/test/test-path/basic.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/test-path/paths.target b/test/test-path/paths.target
index 9b6ed1c13f..1bec148bee 100644
--- a/test/test-path/paths.target
+++ b/test/test-path/paths.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/test-path/sysinit.target b/test/test-path/sysinit.target
index b6c16a1412..eed3d16b45 100644
--- a/test/test-path/sysinit.target
+++ b/test/test-path/sysinit.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/units/basic.target b/test/units/basic.target
index 4f44292249..d8cdd5ac14 100644
--- a/test/units/basic.target
+++ b/test/units/basic.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/units/shutdown.target b/test/units/shutdown.target
index d48e6d6494..582ae6ba27 100644
--- a/test/units/shutdown.target
+++ b/test/units/shutdown.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/units/sockets.target b/test/units/sockets.target
index 9af67fdb1f..c6e20d7760 100644
--- a/test/units/sockets.target
+++ b/test/units/sockets.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/units/sysinit.target b/test/units/sysinit.target
index b6c16a1412..eed3d16b45 100644
--- a/test/units/sysinit.target
+++ b/test/units/sysinit.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/test/units/timers.target b/test/units/timers.target
index b1aa8c797c..99f82e3b80 100644
--- a/test/units/timers.target
+++ b/test/units/timers.target
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#