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: decorate API calls with gcc attributes where appropriate
[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 4cfb2a504a31eac6ff9c91873a09b3580d34d8a4..02fd8b9ce86d22332e537b9ab0b240ec99bc883e 100755
(executable)
--- a/
test/TEST-03-JOBS/test.sh
+++ b/
test/TEST-03-JOBS/test.sh
@@
-1,10
+1,9
@@
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-TEST_DESCRIPTION="Job
merging
"
+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
@@
-33,12
+32,12
@@
run_qemu() {
run_nspawn() {
run_nspawn() {
-
systemd-nspawn -b -D $TESTDIR/nspawn-root --capability=CAP_AUDIT_CONTROL,CAP_AUDIT_WRITE
/usr/lib/systemd/systemd
+
../../systemd-nspawn -b -D $TESTDIR/nspawn-root
/usr/lib/systemd/systemd
ret=1
[[ -e $TESTDIR/nspawn-root/testok ]] && ret=0
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
@@
-138,7
+137,8
@@
Type=oneshot
EOF
# copy the units used by this test
EOF
# copy the units used by this test
- cp $TEST_BASE_DIR/{hello.service,sleep.service,hello-after-sleep.target} $initdir/etc/systemd/system
+ cp $TEST_BASE_DIR/{hello.service,sleep.service,hello-after-sleep.target,unstoppable.service} \
+ $initdir/etc/systemd/system
cp test-jobs.sh $initdir/
mkdir -p $initdir/etc/systemd/system/testsuite.target.wants
cp test-jobs.sh $initdir/
mkdir -p $initdir/etc/systemd/system/testsuite.target.wants
@@
-246,5
+246,4
@@
test_cleanup() {
return 0
}
return 0
}
-. $TEST_BASE_DIR/test-functions
do_test "$@"
do_test "$@"