From: David Zafman <dzafman@redhat.com>
Date: Fri, 6 Dec 2019 17:01:41 +0000 (-0800)
Subject: test: run-standalone.sh: Only run execs in the subdirectories of qa/standalone
X-Git-Tag: v14.2.10~221^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=460034dcb97e492987bd57a74a79c0afbe55f02b;p=ceph.git

test: run-standalone.sh: Only run execs in the subdirectories of qa/standalone

This will ignore scripts placed at the qa/standalone level, though
I'm not sure if we should be putting any tests there.  It does
allow support scripts present like ceph-helper.sh without modifying
run-standalone.sh to ignore it.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 8d3cfc6bc5d979c7398e3561c26a71116079d371)
---

diff --git a/qa/run-standalone.sh b/qa/run-standalone.sh
index 92cca83ce7fd..897b3e53c4cd 100755
--- a/qa/run-standalone.sh
+++ b/qa/run-standalone.sh
@@ -93,13 +93,9 @@ if ls $(dirname $(sysctl -n $KERNCORE)) | grep -q '^core\|core$' ; then
 fi
 
 ulimit -c unlimited
-for f in $(cd $location ; find . -perm $exec_mode -type f)
+for f in $(cd $location ; find . -mindepth 2 -perm $exec_mode -type f)
 do
     f=$(echo $f | sed 's/\.\///')
-    # This is tested with misc/test-ceph-helpers.sh
-    if [[ "$f" = "ceph-helpers.sh" ]]; then
-        continue
-    fi
     if [[ "$all" = "false" ]]; then
         found=false
         for c in "${!select[@]}"