system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-14 20:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: do not use global variable to pass error

Browse source
This commit is contained in:
Yu Watanabe 2018-09-14 13:25:02 +09:00
parent dd75c133d8
commit 0013fac248
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/TEST-21-SYSUSERS/test.sh
View file

@ -15,6 +15,7 @@ prepare_testdir() {
for i in $1.initial-{passwd,group,shadow}; do for i in $1.initial-{passwd,group,shadow}; do
test -f $i && cp $i $TESTDIR/etc/${i#*.initial-} test -f $i && cp $i $TESTDIR/etc/${i#*.initial-}
done done
return 0
} }
preprocess() { preprocess() {

8
test/test-functions
View file

@ -454,7 +454,7 @@ EOF
} }
check_result_nspawn() { check_result_nspawn() {
ret=1 local ret=1
[[ -e $TESTDIR/$1/testok ]] && ret=0 [[ -e $TESTDIR/$1/testok ]] && ret=0
[[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR [[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR
cp -a $TESTDIR/$1/var/log/journal $TESTDIR cp -a $TESTDIR/$1/var/log/journal $TESTDIR
@ -467,7 +467,7 @@ check_result_nspawn() {
# can be overridden in specific test # can be overridden in specific test
check_result_qemu() { check_result_qemu() {
ret=1 local ret=1
mkdir -p $TESTDIR/root mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root mount ${LOOPDEV}p1 $TESTDIR/root
[[ -e $TESTDIR/root/testok ]] && ret=0 [[ -e $TESTDIR/root/testok ]] && ret=0
@ -1547,7 +1547,9 @@ do_test() {
case $1 in case $1 in
--run) --run)
echo "TEST RUN: $TEST_DESCRIPTION" echo "TEST RUN: $TEST_DESCRIPTION"
if test_run; then test_run
ret=$?
if (( $ret == 0 )); then
echo "TEST RUN: $TEST_DESCRIPTION [OK]" echo "TEST RUN: $TEST_DESCRIPTION [OK]"
else else
echo "TEST RUN: $TEST_DESCRIPTION [FAILED]" echo "TEST RUN: $TEST_DESCRIPTION [FAILED]"