chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: make PropertiesChanged emission work
[elogind.git]
/
test
/
TEST-03-JOBS
/
test.sh
diff --git
a/test/TEST-03-JOBS/test.sh
b/test/TEST-03-JOBS/test.sh
index 6eaba72e576a53c56915705cf41057351bea2734..02fd8b9ce86d22332e537b9ab0b240ec99bc883e 100755
(executable)
--- a/
test/TEST-03-JOBS/test.sh
+++ b/
test/TEST-03-JOBS/test.sh
@@
-3,8
+3,7
@@
# ex: ts=8 sw=4 sts=4 et filetype=sh
TEST_DESCRIPTION="Job-related tests"
# ex: ts=8 sw=4 sts=4 et filetype=sh
TEST_DESCRIPTION="Job-related tests"
-KVERSION=${KVERSION-$(uname -r)}
-KERNEL_VER=$(uname -r)
+. $TEST_BASE_DIR/test-functions
# Uncomment this to debug failures
#DEBUGFAIL="systemd.unit=multi-user.target"
# Uncomment this to debug failures
#DEBUGFAIL="systemd.unit=multi-user.target"
@@
-22,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
@@
-36,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
@@
-247,5
+246,4
@@
test_cleanup() {
return 0
}
return 0
}
-. $TEST_BASE_DIR/test-functions
do_test "$@"
do_test "$@"