projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3339 from jkohen/patch-1
[collectd.git]
/
src
/
daemon
/
utils_time_test.c
diff --git
a/src/daemon/utils_time_test.c
b/src/daemon/utils_time_test.c
index
6b8e63d
..
c0179cc
100644
(file)
--- a/
src/daemon/utils_time_test.c
+++ b/
src/daemon/utils_time_test.c
@@
-117,9
+117,6
@@
DEF_TEST(conversion) {
};
for (size_t i = 0; i < (sizeof(cases) / sizeof(cases[0])); i++) {
};
for (size_t i = 0; i < (sizeof(cases) / sizeof(cases[0])); i++) {
- struct timeval tv;
- struct timespec ts;
-
// cdtime -> s
EXPECT_EQ_UINT64(cases[i].tt, CDTIME_T_TO_TIME_T(cases[i].t));
// cdtime -> s
EXPECT_EQ_UINT64(cases[i].tt, CDTIME_T_TO_TIME_T(cases[i].t));
@@
-127,12
+124,12
@@
DEF_TEST(conversion) {
EXPECT_EQ_UINT64(cases[i].ms, CDTIME_T_TO_MS(cases[i].t));
// cdtime -> us
EXPECT_EQ_UINT64(cases[i].ms, CDTIME_T_TO_MS(cases[i].t));
// cdtime -> us
-
CDTIME_T_TO_TIMEVAL(cases[i].t, &tv
);
+
struct timeval tv = CDTIME_T_TO_TIMEVAL(cases[i].t
);
EXPECT_EQ_UINT64(cases[i].tv.tv_sec, tv.tv_sec);
EXPECT_EQ_UINT64(cases[i].tv.tv_usec, tv.tv_usec);
// cdtime -> ns
EXPECT_EQ_UINT64(cases[i].tv.tv_sec, tv.tv_sec);
EXPECT_EQ_UINT64(cases[i].tv.tv_usec, tv.tv_usec);
// cdtime -> ns
-
CDTIME_T_TO_TIMESPEC(cases[i].t, &ts
);
+
struct timespec ts = CDTIME_T_TO_TIMESPEC(cases[i].t
);
EXPECT_EQ_UINT64(cases[i].ts.tv_sec, ts.tv_sec);
EXPECT_EQ_UINT64(cases[i].ts.tv_nsec, ts.tv_nsec);
EXPECT_EQ_UINT64(cases[i].ts.tv_sec, ts.tv_sec);
EXPECT_EQ_UINT64(cases[i].ts.tv_nsec, ts.tv_nsec);
@@
-170,5
+167,3
@@
int main(void) {
END_TEST;
}
END_TEST;
}
-
-/* vim: set sw=2 sts=2 et : */