From 91073a6ab4062f9aa486f1948a7155a0684454da Mon Sep 17 00:00:00 2001
From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 1 Feb 2012 16:13:19 -0800
Subject: [PATCH] check-generated.sh: run on 'make check'

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---
 src/Makefile.am                      |  3 +++
 src/test/encoding/check-generated.sh | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 76328e596776d..c530698b07cc7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,9 @@ check_PROGRAMS =
 # target by target
 TESTS = $(check_PROGRAMS)
 
+check-local:
+	test/encoding/check-generated.sh
+
 EXTRALIBS = -luuid
 if FREEBSD
 EXTRALIBS += -lexecinfo
diff --git a/src/test/encoding/check-generated.sh b/src/test/encoding/check-generated.sh
index 114e1c6ba2052..c0e542d911728 100755
--- a/src/test/encoding/check-generated.sh
+++ b/src/test/encoding/check-generated.sh
@@ -7,17 +7,25 @@ set -e
 tmp1=`mktemp /tmp/typ-XXXXXXXXX`
 tmp2=`mktemp /tmp/typ-XXXXXXXXX`
 
-echo "numgen\ttype"
+echo "checking ceph-dencoder generated test instances..."
+echo "numgen type"
 for type in `./ceph-dencoder list_types`; do
     num=`./ceph-dencoder type $type count_tests`
-    echo "$num\t$type"
+    echo "$num $type"
     for n in `seq 1 $num`; do
 	./ceph-dencoder type $type select_test $n dump_json > $tmp1
 	./ceph-dencoder type $type select_test $n encode decode dump_json > $tmp2
-	cmp $tmp1 $tmp2 || exit 1
+	if ! cmp $tmp1 $tmp2; then
+	    echo "$type test $n json check failed"
+	    exit 1
+	fi
 
 	./ceph-dencoder type $type select_test $n encode export $tmp1
 	./ceph-dencoder type $type select_test $n encode decode encode export $tmp2
-	cmp $tmp1 $tmp2 || exit 1
+	if ! cmp $tmp1 $tmp2; then
+	    echo "$type test $n binary reencode check failed"
+	    exit 1
+	fi
     done
-done
\ No newline at end of file
+done
+echo "ok."
\ No newline at end of file
-- 
2.39.5