]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: run-standalone.sh: Only run execs in the subdirectories of qa/standalone
authorDavid Zafman <dzafman@redhat.com>
Fri, 6 Dec 2019 17:01:41 +0000 (09:01 -0800)
committerDavid Zafman <dzafman@redhat.com>
Fri, 6 Dec 2019 17:19:54 +0000 (09:19 -0800)
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>
qa/run-standalone.sh

index 617f07e75986b13f72ce9d548995b7c882d82540..449c23bf91ba866519a007db97d836d365de7bc3 100755 (executable)
@@ -94,13 +94,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[@]}"