From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Mon, 6 Dec 2010 10:28:22 +0000 (+0100)
Subject: Revert "lib/util:tests/time.c - "test_timestring" - fix it on Solaris"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=bd3e5804a41fdfc8a43bebd95c53e4f0ff1d7a10

Revert "lib/util:tests/time.c - "test_timestring" - fix it on Solaris"

This reverts commit 654e0102ddb0acaaf45fb55c15818722235fcc9f.
This should better be handled by the replace library.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Mon Dec  6 12:17:31 CET 2010 on sn-devel-104
---

diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index 8b0a0c357db2..78e8121b6303 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", *start2 = "Thu Jan 01";
+	const char *start = "Thu Jan  1";
 	char *result;
 	/*
 	 * Correct test for negative UTC offset.  Without the correction, the
@@ -77,10 +77,7 @@ 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)) == 0) ||
-		       (strncmp(start2, result, strlen(start2)) == 0),
-		       result);
+	torture_assert(tctx, !strncmp(start, result, strlen(start)), result);
 	return true;
 }