diff --git a/tests/abuild_test b/tests/abuild_test index d7e4a5e..e87c65a 100755 --- a/tests/abuild_test +++ b/tests/abuild_test @@ -622,8 +622,6 @@ abuild_package_size_body() { cd test-size cat > APKBUILD <<-EOF # Maintainer: Test User 123 <123@example.com> - - # test package pkgname="test-size" pkgver="1.0" pkgrel=0 @@ -732,8 +730,6 @@ abuild_keepdirs_body() { cd test-amove cat > APKBUILD <<-EOF # Maintainer: Test User 123 <123@example.com> - - # test package pkgname="test-keepdirs" pkgver="1.0" pkgrel=0 @@ -758,8 +754,6 @@ abuild_amove_body() { cd test-amove cat > APKBUILD <<-EOF # Maintainer: Test User 123 <123@example.com> - - # test package pkgname="test-amove" pkgver="1.0" pkgrel=0 @@ -854,7 +848,6 @@ abuild_doc_body() { cd foo cat > APKBUILD <<-EOF # Maintainer: Test User 123 <123@example.com> - # test package pkgname="foo" pkgver="1.0" pkgrel=0 @@ -892,7 +885,6 @@ abuild_dev_body() { cd foo cat > APKBUILD <<-EOF # Maintainer: Test User 123 <123@example.com> - # test package pkgname="foo" pkgver="1.0" pkgrel=0 @@ -1001,7 +993,6 @@ abuild_cleanoldpkg_body() { for v in 0.9 1.0 1.1; do cat > APKBUILD <<-EOF # Maintainer: Test User 123 <123@example.com> - # test package pkgname="foo" pkgver="$v" pkgrel=0 diff --git a/tests/testrepo/dbgpkg/APKBUILD b/tests/testrepo/dbgpkg/APKBUILD index e090c35..6f442d2 100644 --- a/tests/testrepo/dbgpkg/APKBUILD +++ b/tests/testrepo/dbgpkg/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname="dbgpkg" pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/invalid-filename/APKBUILD b/tests/testrepo/invalid-filename/APKBUILD index 9793188..d20b36c 100644 --- a/tests/testrepo/invalid-filename/APKBUILD +++ b/tests/testrepo/invalid-filename/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname="invalid-filename" pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/large-doc-subpkg/APKBUILD b/tests/testrepo/large-doc-subpkg/APKBUILD index 631d375..1e3aecc 100644 --- a/tests/testrepo/large-doc-subpkg/APKBUILD +++ b/tests/testrepo/large-doc-subpkg/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname="large-doc-subpkg" pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/lib64test/APKBUILD b/tests/testrepo/lib64test/APKBUILD index 7da888f..9f71da1 100644 --- a/tests/testrepo/lib64test/APKBUILD +++ b/tests/testrepo/lib64test/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname="lib64test" pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/pkg path with spaces/APKBUILD b/tests/testrepo/pkg path with spaces/APKBUILD index 9a1687a..8ba3022 100644 --- a/tests/testrepo/pkg path with spaces/APKBUILD +++ b/tests/testrepo/pkg path with spaces/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname="pkg-path-with-spaces" pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/pkg1/APKBUILD b/tests/testrepo/pkg1/APKBUILD index a87d7d0..35cf4f0 100644 --- a/tests/testrepo/pkg1/APKBUILD +++ b/tests/testrepo/pkg1/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname="pkg1" pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/setcap/APKBUILD b/tests/testrepo/setcap/APKBUILD index 6d5eb88..a665f9d 100644 --- a/tests/testrepo/setcap/APKBUILD +++ b/tests/testrepo/setcap/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname=setcap pkgver="1.0" pkgrel=0 diff --git a/tests/testrepo/subpackage-arch/APKBUILD b/tests/testrepo/subpackage-arch/APKBUILD index a4db324..0d6608b 100644 --- a/tests/testrepo/subpackage-arch/APKBUILD +++ b/tests/testrepo/subpackage-arch/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname=${TESTNAME-test-pkgname} pkgver="${TESTPKGVER-1.0}" pkgrel=0 diff --git a/tests/testrepo/test-licenses/APKBUILD b/tests/testrepo/test-licenses/APKBUILD index 0d954b7..1eeb45f 100644 --- a/tests/testrepo/test-licenses/APKBUILD +++ b/tests/testrepo/test-licenses/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Olliver Schinagl - -# test package pkgname="${TESTNAME-test-licenses}" pkgver="1.0" pkgrel=0 @@ -8,9 +6,9 @@ pkgdesc='Dummy test package that has multi-line licenses' url='https://gitlab.alpinelinux.org/alpine/aports' arch='noarch' license='MIT AND - (GPL-3.0-only OR - - GPL-3.0-or-later AND + (GPL-3.0-only OR + + GPL-3.0-or-later AND BSD-4-Clause) ' diff --git a/tests/testrepo/test-pkgname/APKBUILD b/tests/testrepo/test-pkgname/APKBUILD index e643acd..ab73b59 100644 --- a/tests/testrepo/test-pkgname/APKBUILD +++ b/tests/testrepo/test-pkgname/APKBUILD @@ -1,6 +1,4 @@ # Maintainer: Natanael Copa - -# test package pkgname=${TESTNAME-test-pkgname} pkgver="${TESTPKGVER-1.0}" pkgrel=0