X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=regressions%2Ftest-copy.sh;h=ea6a4cc52f5f8c7e62847df369393be3d02deb7c;hb=cd1322e30d6c34d7d9f87d72dfa1660aa5d8af38;hp=31785ccd4cd03f09c864d942e0ae1bcbcb650595;hpb=b033b55558503a1920c5b7cc1a7e1365749585e0;p=libguestfs.git

diff --git a/regressions/test-copy.sh b/regressions/test-copy.sh
index 31785cc..ea6a4cc 100755
--- a/regressions/test-copy.sh
+++ b/regressions/test-copy.sh
@@ -14,24 +14,36 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Test guestfish copy-in and copy-out commands.
 
+# This test fails on some versions of mock which lack /dev/fd
+# directory.  Skip this test in that case.
+
+test -d /dev/fd || {
+    echo "$0: Skipping this test because /dev/fd is missing."
+    exit 0
+}
+
 set -e
 
 rm -f test1.img
-rm -rf copy
+rm -rf original copy
+
+mkdir original
+cp $srcdir/../images/known* original
+cp -P $srcdir/../images/abssymlink* original
 
 output=$(
 ../fish/guestfish -N fs -m /dev/sda1 <<EOF
 mkdir /data
 # This creates a directory /data/images/
-copy-in ../images /data
-is-file /data/images/known-1
-is-file /data/images/known-3
-is-file /data/images/known-5
-is-symlink /data/images/abssymlink
+copy-in original /data
+is-file /data/original/known-1
+is-file /data/original/known-3
+is-file /data/original/known-5
+is-symlink /data/original/abssymlink
 is-file /data/known-1
 is-file /known-1
 EOF
@@ -52,18 +64,19 @@ fi
 mkdir copy
 
 ../fish/guestfish --ro -a test1.img -m /dev/sda1 <<EOF
-copy-out /data/images copy
+copy-out /data/original copy
 EOF
 
-if [ ! -f copy/images/known-1 -o \
-     ! -f copy/images/known-3 -o \
-     ! -f copy/images/known-5 -o \
-     ! -L copy/images/abssymlink -o \
-     -f copy/known-1 -o \
-     -f known-1 ]; then
+if test ! -f copy/original/known-1 || \
+   test ! -f copy/original/known-3 || \
+   test ! -f copy/original/known-5 || \
+   test ! -L copy/original/abssymlink || \
+   test -f copy/known-1 || \
+   test -f known-1
+then
     echo "$0: error: copy-out command failed"
     exit 1
 fi
 
 rm -f test1.img
-rm -rf copy
\ No newline at end of file
+rm -rf original copy