emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add noextract configuration option

Browse Source 
Closes #208
Fixes #165
This commit is contained in:
Duncan Overbruck
2020-01-18 14:49:59 +01:00
parent ef9260a16e
commit 6794077efd
10 changed files with 269 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xbps/libxbps/shell/Kyuafile
+1
View File
@@ -26,3 +26,4 @@ atf_test_program{name="conflicts_test"}
atf_test_program{name="downgrade_hold_test"}
atf_test_program{name="ignore_test"}
atf_test_program{name="preserve_test"}
atf_test_program{name="noextract_files_test"}
tests/xbps/libxbps/shell/Makefile
+1
View File
@@ -9,6 +9,7 @@ TESTSHELL+= vpkg_test install_test preserve_files_test configure_test
TESTSHELL+= update_shlibs_test update_hold_test update_repolock_test
TESTSHELL+= cyclic_deps_test conflicts_test update_itself_test
TESTSHELL+= downgrade_hold_test ignore_test preserve_test
TESTSHELL+= noextract_files_test
EXTRA_FILES = Kyuafile
include $(TOPDIR)/mk/test.mk
tests/xbps/libxbps/shell/noextract_files_test.sh
+178
View File
@@ -0,0 +1,178 @@
#!/usr/bin/env atf-sh
atf_test_case tc1
tc1_head() {
atf_set "descr" "Tests for pkg install with noextract: match whole directory"
}
tc1_body() {
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/usr/lib
touch pkg_A/usr/bin/blah pkg_A/usr/bin/foo pkg_A/usr/lib/foo
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
mkdir -p root/xbps.d
echo "noextract=/usr/bin/*" > root/xbps.d/foo.conf
xbps-install -C xbps.d -r root --repository=$PWD/some_repo -yd A
atf_check_equal $? 0
rv=0
[ -e root/usr/lib/foo ] || rv=1
[ -e root/usr/bin/blah ] && rv=1
[ -e root/usr/bin/foo ] && rv=1
atf_check_equal $rv 0
xbps-pkgdb -C xbps.d -r root A
atf_check_equal $? 0
}
atf_test_case tc2
tc2_head() {
atf_set "descr" "Tests for pkg install with noextract: match certain file"
}
tc2_body() {
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/usr/lib
touch pkg_A/usr/bin/blah pkg_A/usr/bin/foo pkg_A/usr/lib/foo
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
mkdir -p root/xbps.d
echo "noextract=/usr/bin/f*" > root/xbps.d/foo.conf
xbps-install -C xbps.d -r root --repository=$PWD/some_repo -yd A
atf_check_equal $? 0
tree root
rv=0
[ -e root/usr/lib/foo ] || rv=1
[ -e root/usr/bin/blah ] || rv=1
[ -e root/usr/bin/foo ] && rv=1
atf_check_equal $rv 0
xbps-pkgdb -C xbps.d -r root A
atf_check_equal $? 0
}
atf_test_case tc3
tc3_head() {
atf_set "descr" "Tests for pkg install with noextract: negate pattern"
}
tc3_body() {
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/usr/lib
touch pkg_A/usr/bin/blah pkg_A/usr/bin/foo pkg_A/usr/lib/foo
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
mkdir -p root/xbps.d
echo "noextract=/usr/bin/*" > root/xbps.d/foo.conf
echo "noextract=!/usr/bin/blah" >> root/xbps.d/foo.conf
xbps-install -C xbps.d -r root --repository=$PWD/some_repo -yd A
atf_check_equal $? 0
tree root
rv=0
[ -e root/usr/lib/foo ] || rv=1
[ -e root/usr/bin/blah ] || rv=1
[ -e root/usr/bin/foo ] && rv=1
atf_check_equal $rv 0
xbps-pkgdb -C xbps.d -r root A
atf_check_equal $? 0
}
tc4_head() {
atf_set "descr" "Tests for pkg install with noextract: negate and match again"
}
tc4_body() {
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/usr/lib
touch pkg_A/usr/bin/blah pkg_A/usr/bin/foo pkg_A/usr/lib/foo
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
mkdir -p root/xbps.d
echo "noextract=/usr/bin/*" > root/xbps.d/foo.conf
echo "noextract=!/usr/bin/blah" >> root/xbps.d/foo.conf
echo "noextract=/usr/bin/bla*" >> root/xbps.d/foo.conf
xbps-install -C xbps.d -r root --repository=$PWD/some_repo -yd A
atf_check_equal $? 0
tree root
rv=0
[ -e root/usr/lib/foo ] || rv=1
[ -e root/usr/bin/blah ] && rv=1
[ -e root/usr/bin/foo ] && rv=1
atf_check_equal $rv 0
xbps-pkgdb -C xbps.d -r root A
atf_check_equal $? 0
}
atf_test_case tc5
tc5_head() {
atf_set "descr" "Tests for pkg install with noextract: match full path"
}
tc5_body() {
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/usr/lib
touch pkg_A/usr/bin/blah pkg_A/usr/bin/foo pkg_A/usr/lib/foo
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
mkdir -p root/xbps.d
echo "noextract=*foo" > root/xbps.d/foo.conf
xbps-install -C xbps.d -r root --repository=$PWD/some_repo -yd A
atf_check_equal $? 0
rv=0
[ -e root/usr/lib/foo ] && rv=1
[ -e root/usr/bin/foo ] && rv=1
[ -e root/usr/bin/blah ] || rv=2
atf_check_equal $rv 0
xbps-pkgdb -C xbps.d -r root A
atf_check_equal $? 0
}
atf_init_test_cases() {
atf_add_test_case tc1
atf_add_test_case tc2
atf_add_test_case tc3
atf_add_test_case tc4
atf_add_test_case tc5
}