From: Wouter Verhelst <w@uter.be>
Date: Fri, 27 May 2011 15:57:05 +0000 (+0200)
Subject: Fix 'make distcheck'
X-Git-Url: http://git.alex.org.uk

Fix 'make distcheck'

if we want the test suite to remain working, it has to have all the data
it wants. Ship it with the .tgz so the test suite doesn't have to
generate it (though I suppose we could make it do so if we wanted).

Also, rename the file so it's clear what it's needed for, and so it
isn't accidentally overwritten just because it's the default name.
---

diff --git a/Makefile.am b/Makefile.am
index bded5a0..9deae7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 nbd_server_LDADD = @GLIB_LIBS@
 nbd_tester_client_LDADD = @GLIB_LIBS@
-EXTRA_DIST = gznbd simple_test
+EXTRA_DIST = gznbd simple_test integrity-test.tr
 dist-hook:
 	rm -Rf `find $(distdir) -name '.svn' -type d -print`
 cmd:
diff --git a/integrity-test.tr b/integrity-test.tr
new file mode 100644
index 0000000..5d222aa
Binary files /dev/null and b/integrity-test.tr differ
diff --git a/nbd-tester-client.tr b/nbd-tester-client.tr
deleted file mode 100644
index 5d222aa..0000000
Binary files a/nbd-tester-client.tr and /dev/null differ
diff --git a/simple_test b/simple_test
index 44191eb..1ccf84b 100755
--- a/simple_test
+++ b/simple_test
@@ -145,7 +145,7 @@ EOF
 		./nbd-server -C ${conffile} -p ${pidfile} &
 		PID=$!
 		sleep 1
-		./nbd-tester-client localhost -N export1 -i
+		./nbd-tester-client localhost -N export1 -i -t $(dirname $1)/integrity-test.tr
 		retval=$?
 	;;
 	*)