From d2172b0e89d017c35ab5d2f8de5aed4a1c1c60df Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 31 May 2015 15:11:47 +0200
Subject: [PATCH] tests: move ceph-helpers.sh to qa/workunits

So that it can be used by scripts in qa/workunits that need it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---
 {src/test => qa/workunits}/ceph-helpers.sh | 0
 src/test/erasure-code/test-erasure-code.sh | 2 +-
 src/test/erasure-code/test-erasure-eio.sh  | 2 +-
 src/test/mon/misc.sh                       | 2 +-
 src/test/mon/mon-handle-forward.sh         | 2 +-
 src/test/mon/osd-crush.sh                  | 2 +-
 src/test/mon/osd-erasure-code-profile.sh   | 2 +-
 src/test/mon/osd-pool-create.sh            | 2 +-
 src/test/osd/osd-bench.sh                  | 2 +-
 src/test/osd/osd-config.sh                 | 2 +-
 src/test/osd/osd-copy-from.sh              | 2 +-
 src/test/osd/osd-scrub-repair.sh           | 2 +-
 src/test/test-ceph-helpers.sh              | 2 +-
 src/test/vstart_wrapper.sh                 | 2 +-
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename {src/test => qa/workunits}/ceph-helpers.sh (100%)

diff --git a/src/test/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
similarity index 100%
rename from src/test/ceph-helpers.sh
rename to qa/workunits/ceph-helpers.sh
diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh
index f84ac71e2f5..0a6f1a53d57 100755
--- a/src/test/erasure-code/test-erasure-code.sh
+++ b/src/test/erasure-code/test-erasure-code.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/erasure-code/test-erasure-eio.sh b/src/test/erasure-code/test-erasure-eio.sh
index 9a116fbe345..570e1afa468 100755
--- a/src/test/erasure-code/test-erasure-eio.sh
+++ b/src/test/erasure-code/test-erasure-eio.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/mon/misc.sh b/src/test/mon/misc.sh
index aa4cd4f5741..76c6f92ef78 100755
--- a/src/test/mon/misc.sh
+++ b/src/test/mon/misc.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/mon/mon-handle-forward.sh b/src/test/mon/mon-handle-forward.sh
index 15fbdc561ef..18f6db532ba 100755
--- a/src/test/mon/mon-handle-forward.sh
+++ b/src/test/mon/mon-handle-forward.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index 4857ca2b259..24607301441 100755
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/mon/osd-erasure-code-profile.sh b/src/test/mon/osd-erasure-code-profile.sh
index d9ef569f6ee..be5dbfab664 100755
--- a/src/test/mon/osd-erasure-code-profile.sh
+++ b/src/test/mon/osd-erasure-code-profile.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index c967a962da0..e7d1be6c124 100755
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/osd/osd-bench.sh b/src/test/osd/osd-bench.sh
index e40000f2046..fd466f85837 100755
--- a/src/test/osd/osd-bench.sh
+++ b/src/test/osd/osd-bench.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/osd/osd-config.sh b/src/test/osd/osd-config.sh
index b244a4b4329..1f7348550fa 100755
--- a/src/test/osd/osd-config.sh
+++ b/src/test/osd/osd-config.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/osd/osd-copy-from.sh b/src/test/osd/osd-copy-from.sh
index 93d13930983..6f1e03717ea 100755
--- a/src/test/osd/osd-copy-from.sh
+++ b/src/test/osd/osd-copy-from.sh
@@ -17,7 +17,7 @@
 # GNU Library Public License for more details.
 #
 
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index d5432c2bf0d..13fac7c2a8e 100755
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 function run() {
     local dir=$1
diff --git a/src/test/test-ceph-helpers.sh b/src/test/test-ceph-helpers.sh
index d22c050543f..20c44ff60d2 100755
--- a/src/test/test-ceph-helpers.sh
+++ b/src/test/test-ceph-helpers.sh
@@ -17,4 +17,4 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-test/ceph-helpers.sh TESTS
+../qa/workunits/ceph-helpers.sh TESTS
diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh
index 377cf8dd38e..9ce29f31595 100755
--- a/src/test/vstart_wrapper.sh
+++ b/src/test/vstart_wrapper.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 
-source test/ceph-helpers.sh
+source ../qa/workunits/ceph-helpers.sh
 
 export CEPH_VSTART_WRAPPER=1
 export CEPH_DIR="$PWD/testdir/test-$CEPH_PORT"
-- 
2.47.3