From e8fe4bc59c7675021a0d5673860dd5f8929574e9 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 4 Nov 2015 18:24:15 +0100 Subject: [PATCH] tests: concatenate test_rados_test_tool from src and qa It is good for src/test/test_rados_tool.sh to be run by rados/singleton/all/radostool.yaml because it contains a lot more tests than qa/workunits/rados/test_rados_tool.sh http://tracker.ceph.com/issues/13691 Fixes: #13691 Signed-off-by: Loic Dachary --- qa/workunits/rados/test_rados_tool.sh | 289 ++++++++++++++++++++++++-- src/test/test_rados_tool.sh | 257 +---------------------- 2 files changed, 273 insertions(+), 273 deletions(-) mode change 100755 => 120000 src/test/test_rados_tool.sh diff --git a/qa/workunits/rados/test_rados_tool.sh b/qa/workunits/rados/test_rados_tool.sh index 47ea72b2d71..997d39600b8 100755 --- a/qa/workunits/rados/test_rados_tool.sh +++ b/qa/workunits/rados/test_rados_tool.sh @@ -1,16 +1,271 @@ -#!/bin/bash -ex +#!/bin/bash + +die() { + echo "$@" + exit 1 +} + +usage() { + cat < $V1 - expect_false rados -p $POOL setxattr $OBJ 2>/dev/null - expect_false rados -p $POOL setxattr $OBJ foo fooval extraarg 2>/dev/null - rados -p $POOL setxattr $OBJ foo fooval - rados -p $POOL getxattr $OBJ foo > $V2 + expect_false $RADOS_TOOL -p $POOL setxattr $OBJ 2>/dev/null + expect_false $RADOS_TOOL -p $POOL setxattr $OBJ foo fooval extraarg 2>/dev/null + $RADOS_TOOL -p $POOL setxattr $OBJ foo fooval + $RADOS_TOOL -p $POOL getxattr $OBJ foo > $V2 cmp $V1 $V2 - cat $V1 | rados -p $POOL setxattr $OBJ bar - rados -p $POOL getxattr $OBJ bar > $V2 + cat $V1 | $RADOS_TOOL -p $POOL setxattr $OBJ bar + $RADOS_TOOL -p $POOL getxattr $OBJ bar > $V2 cmp $V1 $V2 - rados -p $POOL listxattr $OBJ > $V1 + $RADOS_TOOL -p $POOL listxattr $OBJ > $V1 grep -q foo $V1 grep -q bar $V1 wc -l $V1 | grep -q "^2 " @@ -53,5 +308,5 @@ test_xattr() { test_xattr test_omap -echo OK +echo "SUCCESS!" exit 0 diff --git a/src/test/test_rados_tool.sh b/src/test/test_rados_tool.sh deleted file mode 100755 index 0fccc6f8346..00000000000 --- a/src/test/test_rados_tool.sh +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/bash - -die() { - echo "$@" - exit 1 -} - -usage() { - cat <