4 files changed, 6 insertions, 15 deletions
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 04fdf8fa9c..4554f52e41 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -47,8 +47,6 @@ static BOOL zero_zero;
 #define NFILES 2
 #define LOCK_TIMEOUT 0
 
-#define NASTY_POSIX_LOCK_HACK 0
-
 static struct cli_credentials *servers[NSERVERS];
 
 enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN};
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 6de93a7a1c..1deefe4bb3 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -1,5 +1,3 @@
-#define NBDEBUG 0
-
 /* 
    Unix SMB/CIFS implementation.
    SMB torture tester
@@ -30,8 +28,6 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 
-#define MAX_FILES 100
-
 extern int nbench_line_count;
 static int nbio_id = -1;
 static int nprocs;
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 6d58b9d6aa..1618f7096a 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -37,14 +37,6 @@
 		goto done; \
 	}} while (0)
 
-#define CHECK_VALUE(v, correct) do { \
-	if ((v) != (correct)) { \
-		printf("(%s) Incorrect value %s=%d - should be %d\n", \
-		       __location__, #v, v, correct); \
-		ret = False; \
-		goto done; \
-	}} while (0)
-
 #define BASEDIR "\\testlock"
 
 
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 7dd32d0976..7998fcf501 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -138,6 +138,7 @@ static union smb_fileinfo *fname_find(const char *name)
 
 /* used to find hints on unknown values - and to make sure 
    we zero-fill */
+#if 0 /* unused */
 #define VAL_UNKNOWN(n1, v1) do {if (s1->n1.out.v1 != 0) { \
         printf("%s/%s non-zero unknown - %u (0x%x) at %s(%d)\n", \
                #n1, #v1, \
@@ -146,6 +147,7 @@ static union smb_fileinfo *fname_find(const char *name)
 	       __FILE__, __LINE__); \
         ret = False; \
 }} while(0)
+#endif
 
 /* basic testing of all RAW_FILEINFO_* calls 
    for each call we test that it succeeds, and where possible test 
@@ -352,6 +354,7 @@ BOOL torture_raw_qfileinfo(struct torture_context *torture)
 		ret = False; \
 	}} while (0)
 
+#if 0 /* unused */
 #define TIME_CHECK_UNX(sname, stype, tfield) do { \
 	s1 = fnum_find(sname); \
 	if (s1 && unx_nt_time_cmp(s1->stype.out.tfield, correct_time) != 0) { \
@@ -367,6 +370,7 @@ BOOL torture_raw_qfileinfo(struct torture_context *torture)
 		       nt_time_string(mem_ctx, correct_time)); \
 		ret = False; \
 	}} while (0)
+#endif
 
 	/* now check that all the times that are supposed to be equal are correct */
 	s1 = fnum_find("BASIC_INFO");
@@ -688,6 +692,7 @@ BOOL torture_raw_qfileinfo(struct torture_context *torture)
 	NAME_PATH_CHECK("ACCESS_INFORMATION", access_information, access_flags);
 #endif
 
+#if 0 /* unused */
 #define UNKNOWN_CHECK(sname, stype, tfield) do { \
 	s1 = fnum_find(sname); \
 	if (s1 && s1->stype.out.tfield != 0) { \
@@ -701,7 +706,7 @@ BOOL torture_raw_qfileinfo(struct torture_context *torture)
                        #stype, #tfield, \
 		       (uint_t)s1->stype.out.tfield); \
 	}} while (0)
-
+#endif
 	/* now get a bit fancier .... */
 	
 	/* when we set the delete disposition then the link count should drop