X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Fcommon_test.c;h=af2840e5883147d474b8bb3b316515b86a6cd408;hp=0c96945f487a5faf1a09a0d06f328a37b6a93a16;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=632cca47086de6cb23c32fc35802da1a19f40875 diff --git a/src/daemon/common_test.c b/src/daemon/common_test.c index 0c96945f..af2840e5 100644 --- a/src/daemon/common_test.c +++ b/src/daemon/common_test.c @@ -27,6 +27,10 @@ #include "common.h" #include "testing.h" +#if HAVE_KSTAT_H +#include +#endif + #if HAVE_LIBKSTAT kstat_ctl_t *kc; #endif /* HAVE_LIBKSTAT */ @@ -55,28 +59,7 @@ DEF_TEST(sstrncpy) { EXPECT_EQ_STR("collect", ptr); OK(buffer[3] == buffer[12]); - return (0); -} - -DEF_TEST(ssnprintf) { - char buffer[16] = ""; - char *ptr = &buffer[4]; - int status; - - buffer[0] = buffer[1] = buffer[2] = buffer[3] = 0xff; - buffer[12] = buffer[13] = buffer[14] = buffer[15] = 0xff; - - status = ssnprintf(ptr, 8, "%i", 1337); - OK(status == 4); - EXPECT_EQ_STR("1337", ptr); - - status = ssnprintf(ptr, 8, "%s", "collectd"); - OK(status == 8); - OK(ptr[7] == 0); - EXPECT_EQ_STR("collect", ptr); - OK(buffer[3] == buffer[12]); - - return (0); + return 0; } DEF_TEST(sstrdup) { @@ -91,7 +74,7 @@ DEF_TEST(sstrdup) { ptr = sstrdup(NULL); OK(ptr == NULL); - return (0); + return 0; } DEF_TEST(strsplit) { @@ -141,7 +124,7 @@ DEF_TEST(strsplit) { status = strsplit(buffer, fields, 8); OK(status == 0); - return (0); + return 0; } DEF_TEST(strjoin) { @@ -190,7 +173,7 @@ DEF_TEST(strjoin) { /* use (NULL, 0) to determine required buffer size. */ EXPECT_EQ_INT(3, strjoin(NULL, 0, (char *[]){"a", "b"}, 2, "-")); - return (0); + return 0; } DEF_TEST(escape_slashes) { @@ -264,7 +247,7 @@ DEF_TEST(strunescape) { status = strunescape(buffer, sizeof(buffer)); OK(status != 0); EXPECT_EQ_STR("\tbackslash end", buffer); - return (0); + return 0; /* Backslash at buffer end */ strncpy(buffer, "\\t3\\56", sizeof(buffer)); @@ -278,7 +261,7 @@ DEF_TEST(strunescape) { OK(buffer[5] == '6'); OK(buffer[6] == '7'); - return (0); + return 0; } DEF_TEST(parse_values) { @@ -323,7 +306,7 @@ DEF_TEST(parse_values) { EXPECT_EQ_DOUBLE(cases[i].value, vl.values[0].gauge); } - return (0); + return 0; } DEF_TEST(value_to_rate) { @@ -380,7 +363,6 @@ DEF_TEST(value_to_rate) { int main(void) { RUN_TEST(sstrncpy); - RUN_TEST(ssnprintf); RUN_TEST(sstrdup); RUN_TEST(strsplit); RUN_TEST(strjoin); @@ -392,5 +374,3 @@ int main(void) { END_TEST; } - -/* vim: set sw=2 sts=2 et : */