From: Tim Prouty <tprouty@samba.org>
Date: Wed, 25 Nov 2009 22:38:55 +0000 (-0800)
Subject: s4 torture: Move target macros to a common header instead of redefining them in multi... 
X-Git-Tag: samba-4.0.0alpha10~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2738e316746b078899dd30e07665d8e7b515581e;p=thirdparty%2Fsamba.git

s4 torture: Move target macros to a common header instead of redefining them in multiple files
---

diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 1ccba61c55a..610cac9f45a 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 f93567f5e59..b006047e945 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 501d14d57c1..35662416b5a 100644
--- 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
 */