From 65a3c21931d7fd633379b55ca4f5ca6232b791d6 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Apr 2016 01:12:45 -0400
Subject: [PATCH] test/encoding/readable.sh: fix make check for autotools

Use ./ if ceph-dencoder is in the local directory.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/test/encoding/readable.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/test/encoding/readable.sh b/src/test/encoding/readable.sh
index e5cfd177ad01..f55d309f2d5d 100755
--- a/src/test/encoding/readable.sh
+++ b/src/test/encoding/readable.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+[ -z "$CEPH_ROOT" ] && CEPH_ROOT=..
+
 dir=$CEPH_ROOT/ceph-object-corpus
 
 set -e
@@ -8,7 +10,13 @@ failed=0
 numtests=0
 pids=""
 
-myversion=`ceph-dencoder version`
+if [ -x ./ceph-dencoder ]; then
+  CEPH_DENCODER=./ceph-dencoder
+else
+  CEPH_DENCODER=ceph-dencoder
+fi
+
+myversion=`$CEPH_DENCODER version`
 DEBUG=0
 WAITALL_DELAY=.1
 debug() { if [ "$DEBUG" -gt 0 ]; then echo "DEBUG: $*" >&2; fi }
@@ -23,7 +31,7 @@ test_object() {
     tmp2=`mktemp /tmp/typ-XXXXXXXXX`
 
     rm -f $output_file
-    if ceph-dencoder type $type 2>/dev/null; then
+    if $CEPH_DENCODER type $type 2>/dev/null; then
       #echo "type $type";
       echo "        $vdir/objects/$type"
 
@@ -86,9 +94,9 @@ test_object() {
           continue
         fi;
 
-        ./ceph-dencoder type $type import $vdir/objects/$type/$f decode dump_json > $tmp1 &
+        $CEPH_DENCODER type $type import $vdir/objects/$type/$f decode dump_json > $tmp1 &
         pid1="$!"
-        ./ceph-dencoder type $type import $vdir/objects/$type/$f decode encode decode dump_json > $tmp2 &
+        $CEPH_DENCODER type $type import $vdir/objects/$type/$f decode encode decode dump_json > $tmp2 &
         pid2="$!"
         #echo "\t$vdir/$type/$f"
         if ! wait $pid1; then
@@ -108,7 +116,7 @@ test_object() {
         # nondeterministically.  compare the sorted json
         # output.  this is a weaker test, but is better than
         # nothing.
-        if ! ceph-dencoder type $type is_deterministic; then
+        if ! $CEPH_DENCODER type $type is_deterministic; then
           echo "  sorting json output for nondeterministic object"
           for f in $tmp1 $tmp2; do
             sort $f | sed 's/,$//' > $f.new
-- 
2.47.3