test: added env var setting to make check scripts

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

diff --git a/qa/workunits/erasure-code/encode-decode-non-regression.sh b/qa/workunits/erasure-code/encode-decode-non-regression.sh
index bd3289c6aaf71e75804f3424deea99aec466ca4d..3e03787206ec3b072fd44d157806ae647b2d99ff 100755 (executable)
--- a/qa/workunits/erasure-code/encode-decode-non-regression.sh
+++ b/qa/workunits/erasure-code/encode-decode-non-regression.sh
@@ -14,6 +14,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../../../src/test/detect-build-env-vars.sh
+
 : ${CORPUS:=https://github.com/ceph/ceph-erasure-code-corpus.git}
 : ${DIRECTORY:=$CEPH_ROOT/ceph-erasure-code-corpus}
 

diff --git a/src/test/cephtool-test-mds.sh b/src/test/cephtool-test-mds.sh
index 1c582ffabdad9818a8f9538676679d1a7fcbf0b6..463f2d4557d4fbbfa58b639190698f3183a46c49 100755 (executable)
--- a/src/test/cephtool-test-mds.sh
+++ b/src/test/cephtool-test-mds.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-CEPH_ROOT=${CEPH_ROOT:-..}
+source $(dirname $0)/detect-build-env-vars.sh
 
 CEPH_CLI_TEST_DUP_COMMAND=1 \
 MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 $CEPH_ROOT/src/test/vstart_wrapper.sh \

diff --git a/src/test/cephtool-test-mon.sh b/src/test/cephtool-test-mon.sh
index 34d32678fdcb3c17b9e87227ff1df775a2490f87..a3b1619ee1301fde387bc2b78c03afd7523fb051 100755 (executable)
--- a/src/test/cephtool-test-mon.sh
+++ b/src/test/cephtool-test-mon.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-CEPH_ROOT=${CEPH_ROOT:-..}
+source $(dirname $0)/detect-build-env-vars.sh
 
 CEPH_CLI_TEST_DUP_COMMAND=1 \
 # uses CEPH_PORT going from 7202 7203 and 7204 because

diff --git a/src/test/cephtool-test-osd.sh b/src/test/cephtool-test-osd.sh
index 247ad112f1e7a3a496aeca33cc01c7d2ec71f8d3..f5091a75f846c6d9a87bce98719305e00d66aea6 100755 (executable)
--- a/src/test/cephtool-test-osd.sh
+++ b/src/test/cephtool-test-osd.sh
@@ -15,7 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
-CEPH_ROOT=${CEPH_ROOT:-..}
+source $(dirname $0)/detect-build-env-vars.sh
 
 CEPH_CLI_TEST_DUP_COMMAND=1 \
 MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 $CEPH_ROOT/src/test/vstart_wrapper.sh \

diff --git a/src/test/cephtool-test-rados.sh b/src/test/cephtool-test-rados.sh
index 402c1c5ff94585a2026386bf724f464dd8521c08..f7766c2a792db5394ea95c06c2a9beb00a5ef1a4 100755 (executable)
--- a/src/test/cephtool-test-rados.sh
+++ b/src/test/cephtool-test-rados.sh
@@ -14,6 +14,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/detect-build-env-vars.sh
+
 CEPH_CLI_TEST_DUP_COMMAND=1 \
 MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7205 $CEPH_ROOT/src/test/vstart_wrapper.sh \
     $CEPH_ROOT/src/test/test_rados_tool.sh

diff --git a/src/test/encoding/check-generated.sh b/src/test/encoding/check-generated.sh
index 20d0c4fc1db739aea9e6cb22a27a79661f326e25..1783cdbafcfdeeba363bd4f1568dda9afc85a0b8 100755 (executable)
--- a/src/test/encoding/check-generated.sh
+++ b/src/test/encoding/check-generated.sh
@@ -1,5 +1,6 @@
 #!/bin/bash -e
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 dir=$1

diff --git a/src/test/encoding/readable.sh b/src/test/encoding/readable.sh
index f55d309f2d5d8d781019e1215e570184f30bb543..f713c8d73ccc4dff67d7955e82a333ad5752f101 100755 (executable)
--- a/src/test/encoding/readable.sh
+++ b/src/test/encoding/readable.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+source $(dirname $0)/../detect-build-env-vars.sh
+
 [ -z "$CEPH_ROOT" ] && CEPH_ROOT=..
 
 dir=$CEPH_ROOT/ceph-object-corpus

diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh
index 49f501f1b1ff865189450662d3cc0e2cae55ce2b..cec40eca815241cfdcc8516ede2a9ec23c199090 100755 (executable)
--- a/src/test/erasure-code/test-erasure-code.sh
+++ b/src/test/erasure-code/test-erasure-code.sh
@@ -16,6 +16,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/erasure-code/test-erasure-eio.sh b/src/test/erasure-code/test-erasure-eio.sh
index 7db60cd1f42d5ecf100c2e68ea2ca23c9f05ed56..d7c3a169225288a721e003f51dbba97411ffb4dd 100755 (executable)
--- a/src/test/erasure-code/test-erasure-eio.sh
+++ b/src/test/erasure-code/test-erasure-eio.sh
@@ -16,6 +16,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/libradosstriper/rados-striper.sh b/src/test/libradosstriper/rados-striper.sh
index a2de948b07fd345b55679e726788608e524db424..a919c3d770b52251bda632682b5b76f407cf81bf 100755 (executable)
--- a/src/test/libradosstriper/rados-striper.sh
+++ b/src/test/libradosstriper/rados-striper.sh
@@ -14,6 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/misc.sh b/src/test/mon/misc.sh
index 53f7bff2409107fc6e9fb241319e3a8f7e3855a8..1b8a88b3e62cc620333a52405253b796b2e86689 100755 (executable)
--- a/src/test/mon/misc.sh
+++ b/src/test/mon/misc.sh
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/mkfs.sh b/src/test/mon/mkfs.sh
index 270736cd36bbe91baf5320332a1665fa4f334139..324457a34f9c6d728281bbe0e0a9733c4ffac054 100755 (executable)
--- a/src/test/mon/mkfs.sh
+++ b/src/test/mon/mkfs.sh
@@ -18,6 +18,8 @@
 set -xe
 PS4='${BASH_SOURCE[0]}:$LINENO: ${FUNCNAME[0]}:  '
 
+source $(dirname $0)/../detect-build-env-vars.sh
+
 DIR=mkfs
 export CEPH_CONF=/dev/null
 unset CEPH_ARGS

diff --git a/src/test/mon/mon-created-time.sh b/src/test/mon/mon-created-time.sh
index 0022a23f9f2debfffa0c1ddd9651aa75108ca6e4..60277155f7a02061a223414a2cb47aefae5bae1f 100755 (executable)
--- a/src/test/mon/mon-created-time.sh
+++ b/src/test/mon/mon-created-time.sh
@@ -12,6 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/mon-handle-forward.sh b/src/test/mon/mon-handle-forward.sh
index f10e6e54be138ebb9db6e34cb2fa8a266e08d21a..64e2f1e72196d75600ef06bfc04e45d912001b45 100755 (executable)
--- a/src/test/mon/mon-handle-forward.sh
+++ b/src/test/mon/mon-handle-forward.sh
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/mon-ping.sh b/src/test/mon/mon-ping.sh
index d3adf5c55d31ef07a53dafc0462d381aa0d06d3a..9fb8848896fcc1a98b48db3488e43b6112afbdcb 100755 (executable)
--- a/src/test/mon/mon-ping.sh
+++ b/src/test/mon/mon-ping.sh
@@ -12,6 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/mon-scrub.sh b/src/test/mon/mon-scrub.sh
index b4205392d66ae8e0c9e7353c499666388b4c0640..b140912ec17e9728ab25d3aa57b59b920132b88e 100755 (executable)
--- a/src/test/mon/mon-scrub.sh
+++ b/src/test/mon/mon-scrub.sh
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index 7323e352ac6fd270f05d7a7687eb0fd5cd2eae81..4fecd4a4d516a3901f8957b71c49ace8a29ef827 100755 (executable)
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/osd-erasure-code-profile.sh b/src/test/mon/osd-erasure-code-profile.sh
index 65c410ad7181a76641d8ad62f8c73b3f40b7d84e..f7a9cc3800e21b6ba6ac01494ca42255a912dcc4 100755 (executable)
--- a/src/test/mon/osd-erasure-code-profile.sh
+++ b/src/test/mon/osd-erasure-code-profile.sh
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index 4a19d13410b8e19f32d8054cedea95a4bb393f81..3deef6fc10d071c7851b8a9f8c94d6918f8b1a26 100755 (executable)
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -15,6 +15,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-bench.sh b/src/test/osd/osd-bench.sh
index fd1f4a624c5ec44fb9e6a74831ab28627ea11e23..ac40cb0d8cd3208b6afd30a40d6e782848398644 100755 (executable)
--- a/src/test/osd/osd-bench.sh
+++ b/src/test/osd/osd-bench.sh
@@ -16,6 +16,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-config.sh b/src/test/osd/osd-config.sh
index 8f2f0db9c5d80bda6b966d6977b4c9962c362368..a27862c2235cbc3a66930169eddecf3fecb2431d 100755 (executable)
--- a/src/test/osd/osd-config.sh
+++ b/src/test/osd/osd-config.sh
@@ -16,6 +16,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-copy-from.sh b/src/test/osd/osd-copy-from.sh
index 2fcf2a8fb9edbd9c072d216b8d3b72bef0338b51..12d2fb48d194c3822981e5bdc71c56394b828105 100755 (executable)
--- a/src/test/osd/osd-copy-from.sh
+++ b/src/test/osd/osd-copy-from.sh
@@ -17,6 +17,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-markdown.sh b/src/test/osd/osd-markdown.sh
index 5cd5c6b0d31a8e4fca7646c9bdc2aca78a4b9e3c..095fe5f95169666b69ffe133040dc7dc46634f56 100755 (executable)
--- a/src/test/osd/osd-markdown.sh
+++ b/src/test/osd/osd-markdown.sh
@@ -16,6 +16,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-reactivate.sh b/src/test/osd/osd-reactivate.sh
index e0aff3f48efdf12fbd502fed49f288ab1e8317cd..311bda457bcaf9b22a7ad6711bfcab5c8bc8ce66 100755 (executable)
--- a/src/test/osd/osd-reactivate.sh
+++ b/src/test/osd/osd-reactivate.sh
@@ -13,6 +13,7 @@
 # GNU Library Public License for more details.
 #
 
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-reuse-id.sh b/src/test/osd/osd-reuse-id.sh
index 59145972a2ae63a7122f0aa4e4f2bc2864985d52..74f3fe38699c43aeb3c032bff9255931fec56219 100755 (executable)
--- a/src/test/osd/osd-reuse-id.sh
+++ b/src/test/osd/osd-reuse-id.sh
@@ -14,6 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index 03580c3f833aabf1933ee59a6b8f853f9cc88bee..3815ea3c2da9ae0e5bcfbe5aa93260622f3d69db 100755 (executable)
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -14,6 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/osd/osd-scrub-snaps.sh b/src/test/osd/osd-scrub-snaps.sh
index d4224489fa4f0cd590822f824ff2fb9d39a831fe..982cc7afdf45ee3658b7870432727ae900771960 100755 (executable)
--- a/src/test/osd/osd-scrub-snaps.sh
+++ b/src/test/osd/osd-scrub-snaps.sh
@@ -14,6 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/../detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 4c325f278e52411068e831a3e1e22d1c1ea9592e..f8983222be87d01efd894f1310b09ddbc32b6c04 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -26,6 +26,8 @@ import json
 
 def get_command_descriptions(what):
     CEPH_BIN = os.environ['CEPH_BIN']
+    if CEPH_BIN == "":
+        CEPH_BIN = "."
     return os.popen(CEPH_BIN + "/get_command_descriptions " + "--" + what).read()
 
 def test_parse_json_funcsigs():

diff --git a/src/test/run-rbd-unit-tests.sh b/src/test/run-rbd-unit-tests.sh
index 00b4d5190d23090617e43919d3017348737bdbcf..b143436303873373fb5b40fe2f479a805b342202 100755 (executable)
--- a/src/test/run-rbd-unit-tests.sh
+++ b/src/test/run-rbd-unit-tests.sh
@@ -2,9 +2,8 @@
 
 # this should be run from the src directory in the ceph.git
 
-CEPH_SRC=$(pwd)
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CEPH_SRC/.libs"
-PATH="$CEPH_SRC:$PATH"
+source $(dirname $0)/detect-build-env-vars.sh
+PATH="$CEPH_BIN:$PATH"
 
 unittest_librbd
 for i in 0 1 61 109

diff --git a/src/test/test-ceph-helpers.sh b/src/test/test-ceph-helpers.sh
index ec6be5fe74e865dc89c7b14d1fbd4c2e978206e4..488bed02318a9217f62753e34e823453400126f5 100755 (executable)
--- a/src/test/test-ceph-helpers.sh
+++ b/src/test/test-ceph-helpers.sh
@@ -17,4 +17,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Library Public License for more details.
 #
+source $(dirname $0)/detect-build-env-vars.sh
+
 $CEPH_ROOT/qa/workunits/ceph-helpers.sh TESTS

diff --git a/src/test/test_pidfile.sh b/src/test/test_pidfile.sh
index 5a9044421cf2e6ff6ff0b786d195244c128208c0..7bc2696a49a1d2223b21d3bba984bd2801c6fbcf 100755 (executable)
--- a/src/test/test_pidfile.sh
+++ b/src/test/test_pidfile.sh
@@ -5,6 +5,7 @@
 #
 
 # Includes
+source $(dirname $0)/detect-build-env-vars.sh
 source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 function run() {