]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:tests: let smbstatus json tests fail if jq is not installed
authorJule Anger <janger@samba.org>
Tue, 16 Aug 2022 10:25:13 +0000 (12:25 +0200)
committerJule Anger <janger@samba.org>
Tue, 16 Aug 2022 14:11:32 +0000 (14:11 +0000)
Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/script/tests/test_smbstatus.sh

index 0eb186e3d8689c0b47df6708b5d94daa5c7d0203..b24fe735aa57978d2d9d64aba5218cc298529026 100755 (executable)
@@ -292,17 +292,6 @@ EOF
                return 1
        fi
 
-       out=$(cat $PREFIX/$status_json | jq ".")
-       echo $out | grep -c 'jq: not found'
-       ret=$?
-       if [ $ret -eq 0 ]; then
-               subunit_start_test "test_smbstatus_json"
-               subunit_skip_test "test_smbstatus_json" <<EOF
-Test needs jq
-EOF
-               return 0
-       fi
-
        out=$(cat $PREFIX/$status_json | jq ".")
        ret=$?
        if [ $ret -ne 0 ]; then
@@ -424,17 +413,6 @@ EOF
                return 1
        fi
 
-       out=$(cat $PREFIX/$status_json | jq ".")
-       echo $out | grep -c 'jq: not found'
-       ret=$?
-       if [ $ret -eq 0 ]; then
-               subunit_start_test "test_smbstatus_json_profile"
-               subunit_skip_test "test_smbstatus_json_profile" <<EOF
-Test needs jq
-EOF
-               return 0
-       fi
-
        out=$(cat $PREFIX/$status_json | jq ".")
        ret=$?
        if [ $ret -ne 0 ]; then