3 files changed, 8 insertions, 7 deletions
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 1ccba61c55..610cac9f45 100644
--- 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 f93567f5e5..b006047e94 100644
--- 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 501d14d57c..35662416b5 100644
--- a/source4/torture/util.h
+++ b/source4/torture/util.h
@@ -26,6 +26,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
 */
 _PUBLIC_ bool torture_setup_dir(struct smbcli_state *cli, const char *dname);