shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-08-30 05:50:12 +03:00
Code Activity

TEST-03-JOBS/test.sh: do not output the "failed" if it does not exist

Browse Source
This commit is contained in:
Harald Hoyer
2013-09-16 18:07:43 -05:00
parent 07ba977575
commit 41a5ef639b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/TEST-03-JOBS/test.sh
View File

@ -21,10 +21,10 @@ run_qemu() {
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
cp -a $TESTDIR/root/failed $TESTDIR [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
cp -a $TESTDIR/root/var/log/journal $TESTDIR cp -a $TESTDIR/root/var/log/journal $TESTDIR
umount $TESTDIR/root umount $TESTDIR/root
cat $TESTDIR/failed [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
ls -l $TESTDIR/journal/*/*.journal ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1)) test -s $TESTDIR/failed && ret=$(($ret+1))
return $ret return $ret
@ -35,9 +35,9 @@ run_nspawn() {
../../systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd ../../systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd
ret=1 ret=1
[[ -e $TESTDIR/nspawn-root/testok ]] && ret=0 [[ -e $TESTDIR/nspawn-root/testok ]] && ret=0
cp -a $TESTDIR/nspawn-root/failed $TESTDIR [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/nspawn-root/failed $TESTDIR
cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR cp -a $TESTDIR/nspawn-root/var/log/journal $TESTDIR
cat $TESTDIR/failed [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
ls -l $TESTDIR/journal/*/*.journal ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1)) test -s $TESTDIR/failed && ret=$(($ret+1))
return $ret return $ret