tests: libxbps/shell: fix tests that use ln(1) -r on travis-ci.

This commit is contained in:
Juan RP 2014-10-06 14:24:42 +02:00
parent 1546e44e70
commit 1a3982bb57
2 changed files with 15 additions and 15 deletions

View File

@ -61,11 +61,11 @@ root_symlinks_update_body() {
mkdir repo
mkdir -p pkg_A/usr/bin pkg_A/usr/sbin pkg_A/usr/lib pkg_A/var pkg_A/run
touch -f pkg_A/usr/bin/foo
ln -sfr pkg_A/usr/bin pkg_A/bin
ln -sfr pkg_A/usr/sbin pkg_A/sbin
ln -sfr pkg_A/usr/lib pkg_A/usr/lib32
ln -sfr pkg_A/usr/lib pkg_A/usr/lib64
ln -sfr pkg_A/run pkg_A/var/run
ln -sf usr/bin pkg_A/bin
ln -sf usr/sbin pkg_A/sbin
ln -sf lib pkg_A/usr/lib32
ln -sf lib pkg_A/usr/lib64
ln -sf ../../run pkg_A/var/run
cd repo
xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A

View File

@ -9,18 +9,18 @@ keep_base_symlinks_head() {
keep_base_symlinks_body() {
mkdir -p root/usr/bin root/usr/lib root/run root/var
ln -sfr root/usr/bin root/bin
ln -sfr root/usr/lib root/lib
ln -sfr root/usr/lib root/usr/lib32
ln -sfr root/usr/lib root/usr/lib64
ln -sfr root/run root/var/run
ln -sf usr/bin root/bin
ln -sf usr/lib root/lib
ln -sf lib root/usr/lib32
ln -sf lib root/usr/lib64
ln -sf ../../run root/var/run
mkdir some_repo
mkdir -p pkg_A/usr/bin pkg_A/bin pkg_A/usr/lib pkg_A/var
touch -f pkg_A/usr/bin/foo
ln -sfr pkg_A/usr/lib pkg_A/usr/lib32
ln -sfr pkg_A/usr/lib pkg_A/usr/lib64
ln -sfr /run pkg_A/var/run
ln -sf lib pkg_A/usr/lib32
ln -sf lib pkg_A/usr/lib64
ln -sf ../../run pkg_A/var/run
cd some_repo
xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
@ -51,8 +51,8 @@ remove_symlinks_body() {
mkdir some_repo
mkdir -p pkg_A/usr/lib pkg_B/usr/lib
touch -f pkg_A/usr/lib/libfoo.so.1.2.0
ln -sfr pkg_A/usr/lib/libfoo.so.1.2.0 pkg_A/usr/lib/libfoo.so.1
ln -sfr pkg_B/usr/lib/libfoo.so.1 pkg_B/usr/lib/libfoo.so
ln -sf libfoo.so.1.2.0 pkg_A/usr/lib/libfoo.so.1
ln -sf libfoo.so.1 pkg_B/usr/lib/libfoo.so
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A