diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2024-04-17 08:16:19 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2024-04-17 08:21:40 +0200 |
commit | e4896c01b88a11052ba54ae2bc750687f5bcf30a (patch) | |
tree | 2bebfbb2f14220d82097e320707d1ecd50889d5c | |
parent | 54fd3e41172a6d1d142782856d47c188af168d03 (diff) |
test: inline bin-in-path APKBUILD
Improves readability. No functional changes
-rwxr-xr-x | tests/abuild_test | 25 | ||||
-rw-r--r-- | tests/testrepo/bin-in-path/APKBUILD | 33 |
2 files changed, 22 insertions, 36 deletions
diff --git a/tests/abuild_test b/tests/abuild_test index dc4593e..7e500d1 100755 --- a/tests/abuild_test +++ b/tests/abuild_test @@ -1038,14 +1038,33 @@ abuild_setcap_binary_with_option_body() { abuild_command_provides_body() { init_keys - cp -ra "$testrepo"/bin-in-path . - cd bin-in-path + mkdir testprovides + cd testprovides + cat >APKBUILD<<-EOF + # Maintainer: Natanael Copa <ncopa@alpinelinux.org> + pkgname=testprovides + pkgver=1.0 + pkgrel=0 + pkgdesc="Dummy test package that installs a file and directory in path" + url="https://gitlab.alpinelinux.org/alpine/aports" + arch="noarch" + license="MIT" + prepare() { mkdir -p "\$builddir"; } + build() { true; } + check() { true; } + package() { + mkdir -p "\$pkgdir/usr/bin" + printf "%s\n" '#!/bin/sh' >"\$pkgdir/usr/bin/foo" + chmod +x "\$pkgdir/usr/bin/foo" + mkdir -p "\$pkgdir/usr/bin/dir/" + } + EOF abuild rootpkg atf_check \ -o match:"provides = cmd:foo=1.0-r0" \ -o not-match:"provides = cmd:dir=1.0-r0" \ - grep '^provides = ' pkg/.control.bin-in-path/.PKGINFO + grep '^provides = ' pkg/.control.testprovides/.PKGINFO } abuild_gocache_dir_body() { diff --git a/tests/testrepo/bin-in-path/APKBUILD b/tests/testrepo/bin-in-path/APKBUILD deleted file mode 100644 index d84a21a..0000000 --- a/tests/testrepo/bin-in-path/APKBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> - -# test package -pkgname=bin-in-path -pkgver=1.0 -pkgrel=0 -pkgdesc="Dummy test package that installs a file and directory in path" -url="https://gitlab.alpinelinux.org/alpine/aports" -arch="noarch" -license="MIT" -source="" - -prepare() { - mkdir -p "$builddir" -} - -build() { - true -} - -check() { - true -} - -package() { - mkdir -p "$pkgdir/usr/bin" - cat >"$pkgdir/usr/bin/foo" <<EOF - #!/bin/sh -EOF - chmod +x "$pkgdir/usr/bin/foo" - mkdir -p "$pkgdir/usr/bin/dir/" -} - |