chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
07ba977
)
TEST-03-JOBS/test.sh: do not output the "failed" if it does not exist
author
Harald Hoyer
<harald@redhat.com>
Mon, 16 Sep 2013 23:07:43 +0000
(18:07 -0500)
committer
Harald Hoyer
<harald@redhat.com>
Tue, 17 Sep 2013 20:19:17 +0000
(15:19 -0500)
test/TEST-03-JOBS/test.sh
patch
|
blob
|
history
diff --git
a/test/TEST-03-JOBS/test.sh
b/test/TEST-03-JOBS/test.sh
index 6440d1f54b00f502aee9ffa7e9e6cc2d0bd4ff3c..02fd8b9ce86d22332e537b9ab0b240ec99bc883e 100755
(executable)
--- a/
test/TEST-03-JOBS/test.sh
+++ b/
test/TEST-03-JOBS/test.sh
@@
-21,10
+21,10
@@
run_qemu() {
mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root
[[ -e $TESTDIR/root/testok ]] && ret=0
mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root
[[ -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
umount $TESTDIR/root
cp -a $TESTDIR/root/var/log/journal $TESTDIR
umount $TESTDIR/root
- cat $TESTDIR/failed
+
[[ -f $TESTDIR/failed ]] &&
cat $TESTDIR/failed
ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1))
return $ret
ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1))
return $ret
@@
-35,9
+35,9
@@
run_nspawn() {
../../systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd
ret=1
[[ -e $TESTDIR/nspawn-root/testok ]] && ret=0
../../systemd-nspawn -b -D $TESTDIR/nspawn-root /usr/lib/systemd/systemd
ret=1
[[ -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
test -s $TESTDIR/failed && ret=$(($ret+1))
return $ret
ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1))
return $ret