diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-06-03 15:11:42 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-06-03 15:11:42 -0700 |
| commit | 70219bee139445ab6116def04e25c245871f8391 (patch) | |
| tree | 5bd69a8fe4e664ca5abfeaed1ce2983ebb5f48ca /source4/torture | |
| parent | 7c926ff1150133127c73b9b46d82524f57b3c616 (diff) | |
| parent | 446748bfe1f06d0900e44fe8acafdf856d54486e (diff) | |
| download | samba-70219bee139445ab6116def04e25c245871f8391.tar.gz samba-70219bee139445ab6116def04e25c245871f8391.tar.bz2 samba-70219bee139445ab6116def04e25c245871f8391.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 9d74201e462f2f95ed5bd91200681db3bd2a9277)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/basic/delaywrite.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index ac4f565a2b..c03e89d36e 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -641,7 +641,7 @@ static bool test_finfo_after_write(struct torture_context *tctx, struct smbcli_s 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; \ } \ @@ -816,6 +816,7 @@ static bool test_delayed_write_update3(struct torture_context *tctx, } 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 +971,7 @@ static bool test_delayed_write_update4(struct torture_context *tctx, } GET_INFO_BOTH(finfo1,pinfo1); + COMPARE_WRITE_TIME_GREATER(pinfo1, pinfo0); /* sure any further write doesn't update the write time */ start = timeval_current(); |