diff options
| author | Karel Zak | 2014-07-31 10:55:38 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-07-31 10:55:38 +0200 |
| commit | f9afb37d1acbe3d192a3ac8017fa4fd424221244 (patch) | |
| tree | 19545f0022047369c228efd557d49c3499f558eb | |
| parent | libfdisk: (gpt) add Microsoft Storage Spaces GUID (diff) | |
| parent | tests: fix rename subdir check that was failing in travis (diff) | |
| download | kernel-qcow2-util-linux-f9afb37d1acbe3d192a3ac8017fa4fd424221244.tar.gz kernel-qcow2-util-linux-f9afb37d1acbe3d192a3ac8017fa4fd424221244.tar.xz kernel-qcow2-util-linux-f9afb37d1acbe3d192a3ac8017fa4fd424221244.zip | |
Merge branch 'travis' of git://github.com/kerolasa/lelux-utiliteetit
* 'travis' of git://github.com/kerolasa/lelux-utiliteetit:
tests: fix rename subdir check that was failing in travis
build-sys: remove swap-common.h from sys-utils/Makemodule.am
| -rw-r--r-- | sys-utils/Makemodule.am | 3 | ||||
| -rwxr-xr-x | tests/ts/rename/subdir | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 4741fed02..ca47df80b 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -253,8 +253,7 @@ dist_man_MANS += \ swapon_SOURCES = \ sys-utils/swapon.c \ - sys-utils/swapon-common.c \ - sys-utils/swapon-common.h + sys-utils/swapon-common.c swapon_CFLAGS = $(AM_CFLAGS) \ -I$(ul_libblkid_incdir) \ -I$(ul_libmount_incdir) \ diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir index f83b2bf10..4ae7005a7 100755 --- a/tests/ts/rename/subdir +++ b/tests/ts/rename/subdir @@ -35,7 +35,9 @@ for i in rename_a{a,b}/sublink.{1..3}; do ln -s rename/aa $i done $TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1 -readlink rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1 +for i in rename_a{a,b}/sublink.?; do + readlink $i >> $TS_OUTPUT 2>&1 +done rm -rf rename_a{a,b} |