diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-11-25 14:38:55 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-12-01 11:12:51 -0800 |
| commit | 2738e316746b078899dd30e07665d8e7b515581e (patch) | |
| tree | 47a7d88c89cfcb8470ad305d7aaf12278146539f /source4/torture | |
| parent | 9d8867f67626ccd93260e83a50aa978d3e12ad1e (diff) | |
| download | samba-2738e316746b078899dd30e07665d8e7b515581e.tar.gz samba-2738e316746b078899dd30e07665d8e7b515581e.tar.bz2 samba-2738e316746b078899dd30e07665d8e7b515581e.zip | |
s4 torture: Move target macros to a common header instead of redefining them in multiple files
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/raw/lock.c | 5 | ||||
| -rw-r--r-- | source4/torture/smb2/create.c | 2 | ||||
| -rw-r--r-- | source4/torture/util.h | 8 |
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); |