The branch, master has been updated
via 654e010 lib/util:tests/time.c - "test_timestring" - fix it on
Solaris
from 55dba7b s4:cluster/cluster.h - fix another gcc 3.4 "struct" warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 654e0102ddb0acaaf45fb55c15818722235fcc9f
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Dec 5 22:20:06 2010 +0100
lib/util:tests/time.c - "test_timestring" - fix it on Solaris
Solaris returns "Thu Jan 01" and not "Thu Jan 1" - therefore proof for
both.
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Sun Dec 5 23:09:13 CET 2010 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/util/tests/time.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index d08a4e7..8b0a0c3 100644
--- a/lib/util/tests/time.c
+++ b/lib/util/tests/time.c
@@ -64,7 +64,7 @@ static bool test_http_timestring(struct torture_context *tctx)
static bool test_timestring(struct torture_context *tctx)
{
- const char *start = "Thu Jan 1";
+ const char *start = "Thu Jan 1", *start2 = "Thu Jan 01";
char *result;
/*
* Correct test for negative UTC offset. Without the correction, the
@@ -77,8 +77,10 @@ static bool test_timestring(struct torture_context *tctx)
time_t utc_offset = mktime(&local) - mktime(&gmt);
result = timestring(tctx, 42 - (utc_offset < 0 ? utc_offset : 0));
- torture_assert(tctx, !strncmp(start, result, strlen(start)),
- result);
+ torture_assert(tctx,
+ (strncmp(start, result, strlen(start)) == 0) ||
+ (strncmp(start2, result, strlen(start2)) == 0),
+ result);
return true;
}
--
Samba Shared Repository
