[SCM] UID Wrapper Repository - branch master updated
Michael Adam
obnox at samba.org
Tue Sep 2 14:10:36 MDT 2014
The branch, master has been updated
via 45b044d TESTS: SYS_gettimeofday behaves differently on OS X
via a7ff27e TESTS: add -DOSX if building on OS X
via 0322556 testsuite: Fix comparison
from 1122f2a tests: Remove test with legacy "access" system call.
http://gitweb.samba.org/?p=uid_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 45b044d753eeb9ec15c7e3d58d9a2d20c1b1fe80
Author: Jakub Hrozek <jakub.hrozek at gmail.com>
Date: Sun Aug 24 00:52:26 2014 +0200
TESTS: SYS_gettimeofday behaves differently on OS X
SYS_gettimeofday returns the number of seconds on OS X and doesn't set
the tz parameter.
Signed-off-by: Jakub Hrozek <jakub.hrozek at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit a7ff27e9889236776cd98fc04c15c733bf5250a5
Author: Jakub Hrozek <jakub.hrozek at gmail.com>
Date: Sun Aug 24 00:50:18 2014 +0200
TESTS: add -DOSX if building on OS X
We need some OS X specific branch in the tests.
Signed-off-by: Jakub Hrozek <jakub.hrozek at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 03225567bbb6cb34b395d878d48d81e57039c753
Author: Jakub Hrozek <jakub.hrozek at gmail.com>
Date: Sun Aug 24 00:54:18 2014 +0200
testsuite: Fix comparison
Signed-off-by: Jakub Hrozek <jakub.hrozek at gmail.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
tests/CMakeLists.txt | 1 +
tests/testsuite.c | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9b1f4bb..7d54876 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,6 +8,7 @@ include_directories(
if (OSX)
set(TEST_ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${UID_WRAPPER_LOCATION};UID_WRAPPER=1)
+ add_definitions(-DOSX)
else ()
set(TEST_ENVIRONMENT LD_PRELOAD=${UID_WRAPPER_LOCATION};UID_WRAPPER=1)
endif ()
diff --git a/tests/testsuite.c b/tests/testsuite.c
index c88b051..1a053b1 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -203,12 +203,16 @@ static void test_uwrap_syscall(void **state)
rc = gettimeofday(&tv1, &tz1);
assert_int_equal(rc, 0);
+#ifdef OSX
+ tv2.tv_sec = syscall(SYS_gettimeofday, &tv2, NULL);
+#else
rc = syscall(SYS_gettimeofday, &tv2, &tz2);
assert_int_equal(rc, 0);
+ assert_int_equal(tz1.tz_dsttime, tz2.tz_dsttime);
+ assert_int_equal(tz1.tz_minuteswest, tz2.tz_minuteswest);
+#endif
assert_int_equal(tv1.tv_sec, tv2.tv_sec);
- assert_int_equal(tz2.tz_dsttime, tz2.tz_dsttime);
- assert_int_equal(tz2.tz_minuteswest, tz2.tz_minuteswest);
}
static void test_uwrap_syscall_setreuid(void **state)
--
UID Wrapper Repository
More information about the samba-cvs
mailing list