]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:torture/vfs/fruit: skip a few tests when running against a macOS SMB server
authorRalph Boehme <slow@samba.org>
Fri, 19 Oct 2018 20:21:10 +0000 (22:21 +0200)
committerKarolin Seeger <kseeger@samba.org>
Tue, 6 Nov 2018 08:10:23 +0000 (09:10 +0100)
These tests are designed to test specific vfs_fruit functionality.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13646

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 242f42ef79e51e35ab33331e2f2d7c9feaac36f8)

source4/torture/vfs/fruit.c

index 6843d120f1898a72b4cae392b247961dd00d3465..c8357f00f9889d10d851ac66fe4326c4de35161a 100644 (file)
@@ -2111,6 +2111,11 @@ static bool test_adouble_conversion(struct torture_context *tctx,
                ":com.apple.metadata" "\xef\x80\xa2" "_kMDItemUserTags:$DATA",
                ":foo" "\xef\x80\xa2" "bar:$DATA", /* "foo:bar:$DATA" */
        };
+       bool is_osx = torture_setting_bool(tctx, "osx", false);
+
+       if (is_osx) {
+               torture_skip(tctx, "Test only works with Samba\n");
+       }
 
        smb2_deltree(tree, BASEDIR);
 
@@ -2185,6 +2190,11 @@ static bool test_adouble_conversion_wo_xattr(struct torture_context *tctx,
        union smb_search_data *d;
        const char *data = "This resource fork intentionally left blank";
        size_t datalen = strlen(data);
+       bool is_osx = torture_setting_bool(tctx, "osx", false);
+
+       if (is_osx) {
+               torture_skip(tctx, "Test only works with Samba\n");
+       }
 
        smb2_deltree(tree, BASEDIR);
 
@@ -4742,6 +4752,11 @@ static bool test_nfs_aces(struct torture_context *tctx,
        struct security_descriptor *psd = NULL;
        NTSTATUS status;
        bool ret = true;
+       bool is_osx = torture_setting_bool(tctx, "osx", false);
+
+       if (is_osx) {
+               torture_skip(tctx, "Test only works with Samba\n");
+       }
 
        ret = enable_aapl(tctx, tree);
        torture_assert(tctx, ret == true, "enable_aapl failed");