Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 3 Jun 2008 22:11:42 +0000 (15:11 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 3 Jun 2008 22:11:42 +0000 (15:11 -0700)
(This used to be commit 9d74201e462f2f95ed5bd91200681db3bd2a9277)

1  2 
source4/torture/basic/delaywrite.c

index ac4f565a2ba207139599801b2b2ff3b01bdcac86,c7bccae08f8cee2caa16d73f95f740230115f66b..c03e89d36eb72738ea14ed639f597bc1b5ecde6e
@@@ -641,7 -641,7 +641,7 @@@ static bool test_finfo_after_write(stru
        bool err = false; \
        if (strict && (g cmp c)) { \
                err = true; \
-       } else if (gr cmp cr) { \
+       } else if ((g cmp c) && (gr cmp cr)) { \
                /* handle filesystem without high resolution timestamps */ \
                err = true; \
        } \
  } while (0)
  #define COMPARE_ACCESS_TIME_EQUAL(given,correct) \
        COMPARE_ACCESS_TIME_CMP(given,correct,!=)
 -#define COMPARE_ACCESS_TIME_GREATER(given,correct) \
 -      COMPARE_ACCESS_TIME_CMP(given,correct,<=)
 -#define COMPARE_ACCESS_TIME_LESS(given,correct) \
 -      COMPARE_ACCESS_TIME_CMP(given,correct,>=)
  
  #define COMPARE_BOTH_TIMES_EQUAL(given,correct) do { \
        COMPARE_ACCESS_TIME_EQUAL(given,correct); \
        COMPARE_WRITE_TIME_EQUAL(given,correct); \
  } while (0)
 -#define COMPARE_BOTH_TIMES_GEATER(given,correct) do { \
 -      COMPARE_ACCESS_TIME_GREATER(given,correct); \
 -      COMPARE_WRITE_TIME_GREATER(given,correct); \
 -} while (0)
 -#define COMPARE_BOTH_TIMES_LESS(given,correct) do { \
 -      COMPARE_ACCESS_TIME_LESS(given,correct); \
 -      COMPARE_WRITE_TIME_LESS(given,correct); \
 -} while (0)
  
  #define GET_INFO_FILE(finfo) do { \
        NTSTATUS _status; \
@@@ -816,6 -828,7 +816,7 @@@ static bool test_delayed_write_update3(
        }
  
        GET_INFO_BOTH(finfo1,pinfo1);
+       COMPARE_WRITE_TIME_GREATER(pinfo1, pinfo0);
  
        /* sure any further write doesn't update the write time */
        start = timeval_current();
@@@ -970,6 -983,7 +971,7 @@@ static bool test_delayed_write_update4(
        }
  
        GET_INFO_BOTH(finfo1,pinfo1);
+       COMPARE_WRITE_TIME_GREATER(pinfo1, pinfo0);
  
        /* sure any further write doesn't update the write time */
        start = timeval_current();