cmake: shell scripts in test/encoding passing in cmake

Replaced relative paths in scripts in test/encoding
to work with CEPH_FOO environment variables set in
cmake, CMakeLists.txt added.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index d5e66758dfa4684573b47268a0ad1e5121fe4c91..bda5d97fc7b2607c8dcd2034aeac8d25b1959b2a 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1343,9 +1343,7 @@ add_executable(unittest_async_compressor EXCLUDE_FROM_ALL
 add_ceph_unittest(unittest_async_compressor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_async_compressor)
 target_link_libraries(unittest_async_compressor global compressor)
 
-#encoding directory
-add_ceph_test(check-generated.sh ${CMAKE_SOURCE_DIR}/src/test/encoding/check-generated.sh)
-add_ceph_test(readable.sh ${CMAKE_SOURCE_DIR}/src/test/encoding/readable.sh)
+add_subdirectory(encoding)
 
 # erasure-code directory
 add_ceph_test(test-erasure-code.sh ${CMAKE_SOURCE_DIR}/src/test/erasure-code/test-erasure-code.sh)

diff --git a/src/test/encoding/CMakeLists.txt b/src/test/encoding/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0ee20fe
--- /dev/null
+++ b/src/test/encoding/CMakeLists.txt
@@ -0,0 +1,4 @@
+# scripts
+add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
+add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
+

diff --git a/src/test/encoding/check-generated.sh b/src/test/encoding/check-generated.sh
index c34fce8f4b45b1a742b5957510b07e84cce5137d..20d0c4fc1db739aea9e6cb22a27a79661f326e25 100755 (executable)
--- a/src/test/encoding/check-generated.sh
+++ b/src/test/encoding/check-generated.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-source ../qa/workunits/ceph-helpers.sh
+source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 dir=$1
 
@@ -15,8 +15,8 @@ failed=0
 numtests=0
 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`
+for type in `ceph-dencoder list_types`; do
+    num=`ceph-dencoder type $type count_tests`
     echo "$num $type"
     for n in `seq 1 1 $num 2>/dev/null`; do
        safe_type=$type
@@ -26,10 +26,10 @@ for type in `./ceph-dencoder list_types`; do
        fi
 
        pids=""
-       run_in_background pids bash -c "./ceph-dencoder type $safe_type select_test $n dump_json > $tmp1"
-       run_in_background pids bash -c "./ceph-dencoder type $safe_type select_test $n encode decode dump_json > $tmp2"
-       run_in_background pids bash -c "./ceph-dencoder type $safe_type select_test $n copy dump_json > $tmp3"
-       run_in_background pids bash -c "./ceph-dencoder type $safe_type select_test $n copy_ctor dump_json > $tmp4"
+       run_in_background pids bash -c "ceph-dencoder type $safe_type select_test $n dump_json > $tmp1"
+       run_in_background pids bash -c "ceph-dencoder type $safe_type select_test $n encode decode dump_json > $tmp2"
+       run_in_background pids bash -c "ceph-dencoder type $safe_type select_test $n copy dump_json > $tmp3"
+       run_in_background pids bash -c "ceph-dencoder type $safe_type select_test $n copy_ctor dump_json > $tmp4"
        wait_background pids
 
        if [ $? -ne 0 ]; then
@@ -43,7 +43,7 @@ for type in `./ceph-dencoder list_types`; do
        # the sorted json output.  this is a weaker test, but is better
        # than nothing.
        deterministic=0
-       if ./ceph-dencoder type $type is_deterministic; then
+       if ceph-dencoder type $type is_deterministic; then
            deterministic=1
        fi
 
@@ -57,37 +57,37 @@ for type in `./ceph-dencoder list_types`; do
 
        if ! cmp $tmp1 $tmp2; then
            echo "**** $type test $n dump_json check failed ****"
-           echo "   ./ceph-dencoder type $type select_test $n dump_json > $tmp1"
-           echo "   ./ceph-dencoder type $type select_test $n encode decode dump_json > $tmp2"
+           echo "   ceph-dencoder type $type select_test $n dump_json > $tmp1"
+           echo "   ceph-dencoder type $type select_test $n encode decode dump_json > $tmp2"
            echo "   diff $tmp1 $tmp2"
            failed=$(($failed + 1))
        fi
 
        if ! cmp $tmp1 $tmp3; then
            echo "**** $type test $n copy dump_json check failed ****"
-           echo "   ./ceph-dencoder type $type select_test $n dump_json > $tmp1"
-           echo "   ./ceph-dencoder type $type select_test $n copy dump_json > $tmp2"
+           echo "   ceph-dencoder type $type select_test $n dump_json > $tmp1"
+           echo "   ceph-dencoder type $type select_test $n copy dump_json > $tmp2"
            echo "   diff $tmp1 $tmp2"
            failed=$(($failed + 1))
        fi
 
        if ! cmp $tmp1 $tmp4; then
            echo "**** $type test $n copy_ctor dump_json check failed ****"
-           echo "   ./ceph-dencoder type $type select_test $n dump_json > $tmp1"
-           echo "   ./ceph-dencoder type $type select_test $n copy_ctor dump_json > $tmp2"
+           echo "   ceph-dencoder type $type select_test $n dump_json > $tmp1"
+           echo "   ceph-dencoder type $type select_test $n copy_ctor dump_json > $tmp2"
            echo "   diff $tmp1 $tmp2"
            failed=$(($failed + 1))
        fi
 
        if [ $deterministic -ne 0 ]; then
-           run_in_background pids bash -c "./ceph-dencoder type $safe_type select_test $n encode export $tmp1"
-           run_in_background pids bash -c "./ceph-dencoder type $safe_type select_test $n encode decode encode export $tmp2"
+           run_in_background pids bash -c "ceph-dencoder type $safe_type select_test $n encode export $tmp1"
+           run_in_background pids bash -c "ceph-dencoder type $safe_type select_test $n encode decode encode export $tmp2"
            wait_background pids
 
            if ! cmp $tmp1 $tmp2; then
                echo "**** $type test $n binary reencode check failed ****"
-               echo "   ./ceph-dencoder type $type select_test $n encode export $tmp1"
-               echo "   ./ceph-dencoder type $type select_test $n encode decode encode export $tmp2"
+               echo "   ceph-dencoder type $type select_test $n encode export $tmp1"
+               echo "   ceph-dencoder type $type select_test $n encode decode encode export $tmp2"
                echo "   cmp $tmp1 $tmp2"
                failed=$(($failed + 1))
            fi

diff --git a/src/test/encoding/readable.sh b/src/test/encoding/readable.sh
index 801336817826649fe5041095f82e959ce65fb65f..e5cfd177ad013c23ce6a97a1257a2b62143ef950 100755 (executable)
--- a/src/test/encoding/readable.sh
+++ b/src/test/encoding/readable.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-dir=../ceph-object-corpus
+dir=$CEPH_ROOT/ceph-object-corpus
 
 set -e
 
@@ -8,7 +8,7 @@ failed=0
 numtests=0
 pids=""
 
-myversion=`./ceph-dencoder version`
+myversion=`ceph-dencoder version`
 DEBUG=0
 WAITALL_DELAY=.1
 debug() { if [ "$DEBUG" -gt 0 ]; then echo "DEBUG: $*" >&2; fi }
@@ -23,7 +23,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"
 
@@ -108,7 +108,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