diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-19 16:00:21 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-19 16:00:21 +0100 |
| commit | 66fac66cc5adc753a0ef55cba7f0d003197eede1 (patch) | |
| tree | ab9da0d3bae2a54938870df28f3e67bb5297f204 | |
| parent | 265fb8052dc3ca334951a5693cdfd6fb968c94c7 (diff) | |
| parent | 278d5115470919319c514ea37d7b14e3f7d0580b (diff) | |
Merge pull request #1960 from evverx/fix-ls-can-not-access
tests: fix ls: cannot access /var/tmp/systemd-test.*/journal/*/*.journal
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index b6b474393d..f93ea934fb 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -11,7 +11,7 @@ check_result_qemu() { mount ${LOOPDEV}p1 $TESTDIR/root [[ -e $TESTDIR/root/testok ]] && ret=0 [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR - [[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR + cp -a $TESTDIR/root/var/log/journal $TESTDIR umount $TESTDIR/root [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed ls -l $TESTDIR/journal/*/*.journal diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index 2997da06ff..8ed39b118a 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -13,7 +13,7 @@ check_result_qemu() { [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile mount /dev/mapper/varcrypt $TESTDIR/root/var - [[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR + cp -a $TESTDIR/root/var/log/journal $TESTDIR umount $TESTDIR/root/var umount $TESTDIR/root cryptsetup luksClose /dev/mapper/varcrypt |