Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8d2c309
tests: Clean up style in backup_lib.sh
Mark Johnston committed 7 months ago
commit 8d2c309d385601393a06b2534f833b779efd1bd7
parent 04615b3
1 file changed +36 -59
modified tests/frontend/backup_lib.sh
@@ -7,14 +7,14 @@ tests_init \


basic_body() {

	atf_skip_on Darwin The macOS linker uses different flags
- 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

files: {

	${TMPDIR}/libempty.so.1: "",

}

EOF
- 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "1"
+ 
	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "1"

	cat << EOF >> foo.ucl

files: {

	${TMPDIR}/libfoo.so.1: "",
@@ -26,40 +26,26 @@ EOF
	cc -shared -Wl,-soname=libfoo.so.1 empty.c -o libfoo.so.1

	sum=$(openssl dgst -sha256 -hex libempty.so.1)
- 
	atf_check \
- 
		-o empty \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg create -M test.ucl
+ 
	atf_check pkg create -M test.ucl
- 
	atf_check \
- 
		-o empty \
- 
		-e empty \
- 
		-s exit:0 \
- 
		pkg create -M foo.ucl
+ 
	atf_check pkg create -M foo.ucl



	atf_check \
- 
		-e empty \
- 
		-o empty \
- 
		-s exit:0 \
- 
		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
+ 
	    pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null \
+ 
	        -r ${TMPDIR}/target \
+ 
	        install -qfy ${TMPDIR}/test-1.pkg



	atf_check \
- 
		-e empty \
- 
		-o empty \
- 
		-s exit:0 \
- 
		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/foo-1.pkg
+ 
	    pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null \
+ 
	        -r ${TMPDIR}/target \
+ 
	        install -qfy ${TMPDIR}/foo-1.pkg
- 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
+ 
	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
- 
	atf_check \
- 
		-s exit:0 \
- 
		pkg create -M test.ucl
+ 
	atf_check pkg create -M test.ucl



	rm test-1.pkg
- 
	atf_check \
- 
		-o ignore \
- 
		-s exit:0 pkg repo .
+ 
	atf_check -o ignore pkg repo .



	mkdir reposconf

	cat <<EOF >> reposconf/repo.conf
@@ -69,39 +55,30 @@ local: {
}

EOF
- 
	atf_check \
- 
		-e empty \
- 
		-o ignore \
- 
		-s exit:0 \
- 
		pkg -o BACKUP_LIBRARY_PATH=/back/ -o BACKUP_LIBRARIES=true -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -y
- 
	atf_check \
- 
		-o ignore \
- 
		-e empty \
- 
		-s exit:0 \
- 
		ls target/back/libempty.so.1
- 
	atf_check \
- 
		-o inline:"/back/libempty.so.1\n" \
- 
		pkg -r ${TMPDIR}/target query "%Fp" compat-libraries
+ 
	atf_check -o ignore \
+ 
	    pkg -o BACKUP_LIBRARY_PATH=/back/ -o BACKUP_LIBRARIES=true \
+ 
	        -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target \
+ 
	        upgrade -y
+ 
	atf_check -o ignore \
+ 
	    ls target/back/libempty.so.1
+ 
	atf_check -o inline:"/back/libempty.so.1\n" \
+ 
	    pkg -r ${TMPDIR}/target query "%Fp" compat-libraries

	rm foo-1.pkg
- 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "2"
- 
	atf_check \
- 
		-s exit:0 \
- 
		pkg create -M foo.ucl
- 
	atf_check \
- 
		-o ignore \
- 
		-s exit:0 pkg repo .
- 
	atf_check \
- 
		-o ignore \
- 
		pkg -o BACKUP_LIBRARY_PATH=/back/ -o BACKUP_LIBRARIES=true -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target update -f
+ 
	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "2"
+ 
	atf_check pkg create -M foo.ucl
+ 
	atf_check -o ignore pkg repo .
+ 
	atf_check -o ignore \
+ 
	    pkg -o BACKUP_LIBRARY_PATH=/back/ -o BACKUP_LIBRARIES=true \
+ 
	        -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target \
+ 
	        update -f

	version1=$(pkg -r ${TMPDIR}/target query "%v" compat-libraries)
- 
	atf_check \
- 
		-e empty \
- 
		-o ignore \
- 
		-s exit:0 \
- 
		pkg -o BACKUP_LIBRARY_PATH=/back/ -o BACKUP_LIBRARIES=true -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -y
- 
	atf_check \
- 
		-o inline:"/back/libempty.so.1\n/back/libfoo.so.1\n" \
- 
		pkg -r ${TMPDIR}/target query "%Fp" compat-libraries
+ 
	atf_check -o ignore \
+ 
	    pkg -o BACKUP_LIBRARY_PATH=/back/ -o BACKUP_LIBRARIES=true \
+ 
	        -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target \
+ 
	        upgrade -y
+ 
	atf_check -o inline:"/back/libempty.so.1\n/back/libfoo.so.1\n" \
+ 
	    pkg -r ${TMPDIR}/target query "%Fp" compat-libraries

	version2=$(pkg -r ${TMPDIR}/target query "%v" compat-libraries)
- 
	[ ${version2} -ge ${version1} ] || atf_fail "the version hasn't been bumped ${version2} >= ${version1}"
+ 
	[ ${version2} -ge ${version1} ] || \
+ 
	    atf_fail "the version hasn't been bumped ${version2} >= ${version1}"

}