test: use "ln -fs"
Without this, repeated runs of "make -C TEST/... setup" fail when trying to create the symlink.
This commit is contained in:
parent
e5369d1a8f
commit
976ed3b621
|
@ -93,11 +93,11 @@ EOF
|
||||||
)
|
)
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -65,11 +65,11 @@ EOF
|
||||||
ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/local-fs.target.wants/-.mount
|
ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/local-fs.target.wants/-.mount
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -33,11 +33,11 @@ EOF
|
||||||
)
|
)
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -47,11 +47,11 @@ EOF
|
||||||
setup_nspawn_root
|
setup_nspawn_root
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -74,11 +74,11 @@ chmod +x $initdir/test-machine-id-setup.sh
|
||||||
)
|
)
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -10,11 +10,11 @@ test_setup() {
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
|
|
||||||
# import the test scripts in the rootfs and plug them in systemd
|
# import the test scripts in the rootfs and plug them in systemd
|
||||||
cp testsuite.service $initdir/etc/systemd/system/
|
cp testsuite.service $initdir/etc/systemd/system/
|
||||||
|
|
|
@ -30,11 +30,11 @@ test_setup() {
|
||||||
setup_testsuite
|
setup_testsuite
|
||||||
)
|
)
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
|
|
||||||
setup_nspawn_root
|
setup_nspawn_root
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,11 +16,11 @@ test_setup() {
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
|
|
||||||
# setup the testsuite service
|
# setup the testsuite service
|
||||||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
||||||
|
|
|
@ -32,11 +32,11 @@ EOF
|
||||||
setup_nspawn_root
|
setup_nspawn_root
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -93,9 +93,9 @@ EOF
|
||||||
setup_nspawn_root
|
setup_nspawn_root
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -51,11 +51,11 @@ EOF
|
||||||
setup_nspawn_root
|
setup_nspawn_root
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
|
|
@ -16,11 +16,11 @@ test_setup() {
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
|
|
||||||
# setup the testsuite service
|
# setup the testsuite service
|
||||||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
||||||
|
|
|
@ -16,11 +16,11 @@ test_setup() {
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
|
|
||||||
# mask some services that we do not want to run in these tests
|
# mask some services that we do not want to run in these tests
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
||||||
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
||||||
|
|
||||||
# setup the testsuite service
|
# setup the testsuite service
|
||||||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
||||||
|
|
Loading…
Reference in a new issue