36fb57a Switch to using new_pkg() from test_subr.sh — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Switch to using new_pkg() from test_subr.sh

Brad Davis committed 8 years ago

commit 36fb57a00e286ff23987439e44a4a59aedae5c7b
parent 8c5d9e9

1 file changed +14 -84

modified tests/frontend/packagemerge.sh

@@ -10,69 +10,29 @@ package_merge_body() {

 	touch file2
 	touch file3
 	cat << EOF > pkg1.ucl
 name: test-file1
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test-file1 1
 	cat << EOF >> pkg1.ucl
 files: {
 	${TMPDIR}/file1: "",
 }
 EOF
 	cat << EOF > pkg2.ucl
 name: test-file2
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 test-file2 1
 	cat << EOF >> pkg2.ucl
 files: {
 	${TMPDIR}/file2: "",
 }
 EOF
 	cat << EOF > pkg3.ucl
 name: test-file3
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 test-file3 1
 	cat << EOF >> pkg3.ucl
 files: {
 	${TMPDIR}/file3: "",
 }
 EOF
 	cat << EOF > pkg4.ucl
 name: test
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test 1
 	cat << EOF >> pkg4.ucl
 deps: {
 	test-file1: {
 		origin: test

@@ -89,18 +49,8 @@ deps: {

 }
 EOF
 	cat << EOF > dep1.ucl
 name: plop
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg dep1 test1 1
 	cat << EOF >> dep1.ucl
 deps: {
 	test-file1: {
 		origin: test

@@ -117,18 +67,8 @@ EOF

 			pkg register -M ${p}.ucl
 	done
 	cat << EOF > pkg5.ucl
 name: test
 origin: test
 version: "1.1"
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg5 test 1.1
 	cat << EOF >> pkg5.ucl
 files: {
 	${TMPDIR}/file1: "",
 	${TMPDIR}/file2: "",

@@ -136,18 +76,8 @@ files: {

 }
 EOF
 	cat << EOF > dep2.ucl
 name: plop
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /usr/local
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg dep2 test1 1
 	cat << EOF >> dep2.ucl
 deps: {
 	test: {
 		origin: test