4536a78 Switch to using the new_pkg helper function — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Switch to using the new_pkg helper function

Brad Davis committed 1 year ago

commit 4536a78ce73af4f1e21d9952444338b32f856968
parent b95e1bc

1 file changed +3 -42

modified tests/frontend/pubkey.sh

@@ -31,20 +31,7 @@ ecc_test() {

 	mkdir fakerepo
 	cat >> test.ucl << EOF
 name: test
 origin: test
 version: "1"
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /
 abi = "*";
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 /
 	atf_check -o ignore -e ignore \
 		pkg create -M test.ucl -o fakerepo

@@ -77,20 +64,7 @@ pubkey_rsa_body() {

 		pkg key --create repo.key
 	mkdir fakerepo
 	cat >> test.ucl << EOF
 name: test
 origin: test
 version: "1"
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /
 abi = "*";
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 /
 	atf_check -o ignore -e ignore \
 		pkg create -M test.ucl -o fakerepo

@@ -116,20 +90,7 @@ pubkey_legacy_body() {

 		pkg key --create repo.key
 	mkdir fakerepo
 	cat >> test.ucl << EOF
 name: test
 origin: test
 version: "1"
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /
 abi = "*";
 desc: <<EOD
 Yet another test
 EOD
 EOF
 	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 /
 	atf_check -o ignore -e ignore \
 		pkg create -M test.ucl -o fakerepo