test/encoding/import-genearted: fix

Dest dir was wrong, cp shortcut check was wrong.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/test/encoding/import-generated.sh b/src/test/encoding/import-generated.sh
index c557f9264d2ee20e864294cb998c11e639502510..ed2429a503e7b52d2318872093c919a5529c636f 100755 (executable)
--- a/src/test/encoding/import-generated.sh
+++ b/src/test/encoding/import-generated.sh
@@ -14,7 +14,7 @@ tmp1=`mktemp /tmp/typ-XXXXXXXXX`
 echo "numgen\ttype"
 for type in `./ceph-dencoder list_types`; do
 
-    [ -d "$archive/$ver/$type" ] || mkdir "$archive/$ver/$type"
+    [ -d "$archive/$ver/objects/$type" ] || mkdir -p "$archive/$ver/objects/$type"
 
     num=`./ceph-dencoder type $type count_tests`
     echo "$num\t$type"
@@ -23,7 +23,7 @@ for type in `./ceph-dencoder list_types`; do
        ./ceph-dencoder type $type select_test $n encode export $tmp1
        md=`md5sum $tmp1 | awk '{print $1}'`
        echo "\t$md"
-       [ -e "$archive/$ver/$md" ] || cp $tmp1 $archive/$ver/$type/$md
+       [ -e "$archive/$ver/objects/$type/$md" ] || cp $tmp1 $archive/$ver/objects/$type/$md
     done
 done