s4 torture: Move target macros to a common header instead of redefining them in multi...

diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 1ccba61c55a80ea5fe3188d3ba31475a39628a14..610cac9f45a239468daf4d9a0fcd71906c607198 100644 (file)
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -69,11 +69,6 @@
        }} while (0)
 #define BASEDIR "\\testlock"
 
-#define TARGET_IS_W2K8(_tctx) (torture_setting_bool(_tctx, "w2k8", false))
-#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
-#define TARGET_IS_SAMBA3(_tctx) (torture_setting_bool(_tctx, "samba3", false))
-#define TARGET_IS_SAMBA4(_tctx) (torture_setting_bool(_tctx, "samba4", false))
-
 /*
   test SMBlock and SMBunlock ops
 */

diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index f93567f5e59478f6741c28a35262c57d9b54a94a..b006047e945c4641cd5f7ae7fa530123b932f6e1 100644 (file)
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -126,8 +126,6 @@
                       __location__, sattrib, fname); \
        }} while (0)
 
-#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
-
 /*
   test some interesting combinations found by gentest
  */

diff --git a/source4/torture/util.h b/source4/torture/util.h
index 501d14d57c1d314c7471bb2f13ef0903f4f29fc3..35662416b5ab274e7531e7ce2cfb4d4d8de39f26 100644 (file)
--- a/source4/torture/util.h
+++ b/source4/torture/util.h
@@ -25,6 +25,14 @@
 struct smbcli_state;
 struct smbcli_tree;
 
+/**
+ * Useful target macros for handling server bugs in torture tests.
+ */
+#define TARGET_IS_W2K8(_tctx) (torture_setting_bool(_tctx, "w2k8", false))
+#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
+#define TARGET_IS_SAMBA3(_tctx) (torture_setting_bool(_tctx, "samba3", false))
+#define TARGET_IS_SAMBA4(_tctx) (torture_setting_bool(_tctx, "samba4", false))
+
 /**
   setup a directory ready for a test
 */