workunits/dencoder: use readable.sh script instead of python script

The python script test_readable.py was added for backword and forward
compability. maintaining 2 scripts that finally doing the same is west,
reverting and using readable.sh and leave the python out.

https://tracker.ceph.com/issues/74074
Signed-off-by: Nitzan Mordechai <nmordech@ibm.com>

diff --git a/qa/workunits/dencoder/test-dencoder.sh b/qa/workunits/dencoder/test-dencoder.sh
index dfa8da886b6ca33be781355aa4d022799cc3df9a..9f22aad66d9f7b8d2cc310196494a4f137f66aeb 100755 (executable)
--- a/qa/workunits/dencoder/test-dencoder.sh
+++ b/qa/workunits/dencoder/test-dencoder.sh
@@ -7,6 +7,7 @@ ceph-dencoder version
 # clone the corpus repository on the host
 git clone -b master https://github.com/ceph/ceph-object-corpus.git $CEPH_MNT/client.0/tmp/ceph-object-corpus-master
 
-$mydir/test_readable.py $CEPH_MNT/client.0/tmp/ceph-object-corpus-master
+export CORPUS_PATH=$CEPH_MNT/client.0/tmp/ceph-object-corpus-master
+$mydir/../../../src/test/encoding/readable.sh
 
 echo $0 OK

diff --git a/src/test/encoding/readable.sh b/src/test/encoding/readable.sh
index 81545852cf515a9a31f360d970914d58340288ce..230043a9630721bee82040c8757a1060b037b4eb 100755 (executable)
--- a/src/test/encoding/readable.sh
+++ b/src/test/encoding/readable.sh
@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
 set -e
 
-source $(dirname $0)/../detect-build-env-vars.sh
 
 [ -z "$CEPH_ROOT" ] && CEPH_ROOT=..
 
-dir=$CEPH_ROOT/ceph-object-corpus
+# check if CORPUS_PATH is set then use it for dir, if not use $CEPH_ROOT/ceph-object-corpus
+if [ -n "$CORPUS_PATH" ]; then
+    dir=$CORPUS_PATH
+else
+    source $(dirname $0)/../detect-build-env-vars.sh
+    dir=$CEPH_ROOT/ceph-object-corpus
+fi
 
 failed=0
 numtests=0