From 3010285bb3242f36af7fc434fd2eae18fd8beec6 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Thu, 21 Aug 2008 14:33:48 +0000 Subject: [PATCH] Fix symbolic link creation in test infrastructure. Original code would create "*.so" symbolic links if there were no actual files ending in "so". The second iteration would then cause an error in the test logs. --- test/lvm-utils.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/lvm-utils.sh b/test/lvm-utils.sh index e7ca2c250..aee443dc6 100644 --- a/test/lvm-utils.sh +++ b/test/lvm-utils.sh @@ -152,8 +152,16 @@ init_root_dir_() for i in 0 1 2 3 4 5 6 7; do mknod $G_root_/dev/loop$i b 7 $i done - ln -s $abs_top_builddir/dmeventd/mirror/*.so $G_root_/lib - ln -s $abs_top_builddir/dmeventd/snapshot/*.so $G_root_/lib + for i in $abs_top_builddir/dmeventd/mirror/*.so $abs_top_builddir/dmeventd/snapshot/*.so + do + # NOTE: This check is necessary because the loop above will give us the value + # "$abs_top_builddir/dmeventd/mirror/*.so" if no files ending in 'so' exist. + # This is the best way I could quickly determine to skip over this bogus value. + if [ -f $i ]; then + echo Setting up symlink from $i to $G_root_/lib + ln -s $i $G_root_/lib + fi + done cat > $G_root_/etc/lvm.conf <<-EOF devices { dir = "$G_dev_"