[Pkg-libvirt-commits] [libguestfs] 21/66: tests/data: Remove abssymlink.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.54-1
in repository libguestfs.

commit 5bb26dcd3c6be56b432c6bdc545968d8722af486
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Sep 20 14:48:17 2014 +0100

    tests/data: Remove abssymlink.
    
    This file causes the test ISO to be rebuilt every time.
    
    Instead of including it as a Makefile dependency, create it just
    before making the ISO, which has the same effect.
    
    A test in fish/ also used this file.  Change it so it doesn't need it.
---
 fish/test-copy.sh      |  2 +-
 tests/data/Makefile.am | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/fish/test-copy.sh b/fish/test-copy.sh
index f72de9b..ddddea1 100755
--- a/fish/test-copy.sh
+++ b/fish/test-copy.sh
@@ -33,7 +33,7 @@ rm -rf test-copy-original test-copy-copy
 
 mkdir test-copy-original
 cp $srcdir/../tests/data/known* test-copy-original
-cp -P ../tests/data/abssymlink* test-copy-original
+ln -sf /nowhere test-copy-original/abssymlink
 
 output=$(
 $VG guestfish -N test-copy.img=fs -m /dev/sda1 <<EOF
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 78cadbd..d00400d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -72,7 +72,6 @@ images_files_build = \
 	100kallspaces \
 	100krandom \
 	10klines \
-	abssymlink \
 	blank-disk-1s.raw \
 	blank-disk-1s.qcow2 \
 	blank-disk-1K.raw \
@@ -95,10 +94,12 @@ images_files = $(images_files_src) $(images_files_build)
 test.iso: $(images_files)
 	rm -f $@ $@-t
 	mkdir -p directory
+	ln -sf /10klines abssymlink
 	$(GENISOIMAGE) -J -r -graft-points \
 	  -o $@-t \
-	  $(images_files) /directory=directory
+	  $(images_files) /directory=directory abssymlink
 	rmdir directory
+	rm abssymlink
 	mv $@-t $@
 
 100kallzeroes:
@@ -130,11 +131,6 @@ test.iso: $(images_files)
 	done > $@-t
 	mv $@-t $@
 
-# XXX Make examines this file and believes that it does not exist,
-# resulting in the ISO being rebuilt every time.
-abssymlink:
-	ln -sf /10klines $@
-
 # Blank disk images in various sizes and formats.
 blank-disk-1s.raw:
 	rm -f $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git