noselasd/libucore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nuke warnings in tests

Browse Source
This commit is contained in:
Nils O. Selåsdal
2025-07-18 22:45:08 +02:00
parent cfe647f85d
commit 5b5ca445e9
11 changed files with 230 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mersenne_twister.c
+6 -6
View File
@@ -1,4 +1,4 @@
/*Copyright (c) 2004 Nils O. Selåsdal <NOS {on} Utel {dot} no> */
/*Copyright (c) 2004 Nils O. Sel�sdal <NOS {on} Utel {dot} no> */
/*Straight forward attempt at a Mersenne Twister PRNG */
#include "ucore/mersenne_twister.h"
@@ -24,7 +24,7 @@ enum {
void mtsrand(int seed, MTRand *r)
{
int j;
unsigned j;
for (j = 0 ; j < N ; j++) {
r->x[j] = seed * ((j+1)<< 3)|0x1;
}
@@ -36,16 +36,16 @@ unsigned int mtrand(MTRand *r)
{
unsigned int y;
unsigned int ch[] = {0, a};
y = r->x[r->i] & U;
y |= r->x[r->i % N];
y &= LL;
r->x[r->i] = r->x[(r->i + M ) %N];
r->x[r->i] ^= y >> 1;
r->x[r->i] ^= ch[y&0x1];
y = r->x[r->i];
y ^= y >> u;
y ^= (y << s) & b;
@@ -55,7 +55,7 @@ unsigned int mtrand(MTRand *r)
r->i = (r->i + 1) % N;
return y;
}
}
#ifdef TEST_MT
#include <stdio.h>
#include <time.h>
test/test_bcd.c
+42 -42
View File
@@ -8,12 +8,12 @@ START_TEST (test_2bcd_1234567890)
unsigned char bcd[5];
size_t len = uc_ascii2bcd(ascii, bcd, 0);
fail_if(len != 5, "len is %zu", len);
fail_if(bcd[0] != 0x21,"was 0x%x",bcd[0]);
fail_if(bcd[1] != 0x43,"was 0x%x",bcd[1]);
fail_if(bcd[2] != 0x65,"was 0x%x",bcd[2]);
fail_if(bcd[3] != 0x87,"was 0x%x",bcd[3]);
fail_if(bcd[4] != 0x09,"was 0x%x",bcd[4]);
ck_assert_int_eq(len, 5);
ck_assert_int_eq(bcd[0], 0x21);
ck_assert_int_eq(bcd[1], 0x43);
ck_assert_int_eq(bcd[2], 0x65);
ck_assert_int_eq(bcd[3], 0x87);
ck_assert_int_eq(bcd[4], 0x09);
}
END_TEST
@@ -23,7 +23,7 @@ START_TEST (test_2bcd_empty)
unsigned char bcd[1];
size_t len = uc_ascii2bcd(ascii, bcd, 3);
fail_if(len != 0, "len is %zu", len);
ck_assert_int_eq(len, 0);
}
END_TEST
@@ -33,8 +33,8 @@ START_TEST (test_2bcd_1_filler)
unsigned char bcd[1];
size_t len = uc_ascii2bcd(ascii, bcd, 0xa);
fail_if(len != 1, "len is %zu", len);
fail_if(bcd[0] != 0xa1,"was 0x%x",bcd[0]);
ck_assert_int_eq(len, 1);
ck_assert_int_ne(bcd[0], 0);
}
END_TEST
@@ -44,10 +44,10 @@ START_TEST (test_2bcd_2_filler)
unsigned char bcd[2];
size_t len = uc_ascii2bcd(ascii, bcd, 0xf);
fail_if(len != 2, "len is %zu", len);
fail_if(bcd[0] != 0x21,"was 0x%x",bcd[0]);
fail_if(bcd[1] != 0xf3,"was 0x%x",bcd[1]);
fail_if(UC_BCD_LEN(strlen(ascii)) != len);
ck_assert_int_eq(len , 2);
ck_assert_int_eq(bcd[0] , 0x21);
ck_assert_int_eq(bcd[1] , 0xf3);
ck_assert_int_eq(UC_BCD_LEN(strlen(ascii)) , len);
}
END_TEST
@@ -58,9 +58,9 @@ START_TEST (test_2bcd_3_filler)
unsigned char bcd[2];
size_t len = uc_ascii2bcd(ascii, bcd, 0x0);
fail_if(len != 2, "len is %zu", len);
fail_if(bcd[0] != 0x21,"was 0x%x",bcd[0]);
fail_if(bcd[1] != 0x03,"was 0x%x",bcd[1]);
ck_assert_int_eq(len , 2);
ck_assert_int_eq(bcd[0] , 0x21);
ck_assert_int_eq(bcd[1] , 0x03);
}
END_TEST
@@ -71,7 +71,7 @@ START_TEST (test_2bcd_non_digits)
unsigned char bcd[10];
size_t len = uc_ascii2bcd(ascii, bcd, 0x0);
fail_if(len != 0, "len is %zu", len);
ck_assert_int_eq(len , 0);
}
END_TEST
@@ -82,12 +82,12 @@ START_TEST (test_2bcd_phoneno)
unsigned char bcd[24];
size_t len = uc_ascii2bcd(ascii, bcd, 0xf);
fail_if(len != 5, "len is %zu", len);
fail_if(bcd[0] != 0x00,"was 0x%x",bcd[0]);
fail_if(bcd[1] != 0x74,"was 0x%x",bcd[1]);
fail_if(bcd[2] != 0x23,"was 0x%x",bcd[1]);
fail_if(bcd[3] != 0x33,"was 0x%x",bcd[1]);
fail_if(bcd[4] != 0xf4,"was 0x%x",bcd[1]);
ck_assert_int_eq(len , 5);
ck_assert_int_eq(bcd[0] , 0x00);
ck_assert_int_eq(bcd[1] , 0x74);
ck_assert_int_eq(bcd[2] , 0x23);
ck_assert_int_eq(bcd[3] , 0x33);
ck_assert_int_eq(bcd[4] , 0xf4);
}
END_TEST
@@ -98,8 +98,8 @@ START_TEST (test_2bcd_binary)
unsigned char bcd[24];
size_t len = uc_ascii2bcd(ascii, bcd, 0xf);
fail_if(len != 1, "len is %zu", len);
fail_if(bcd[0] != 0xf2,"0 was 0x%x",bcd[0]);
ck_assert_int_eq(len , 1);
ck_assert_int_eq(bcd[0], 0xf2);
}
END_TEST
@@ -110,13 +110,13 @@ START_TEST (test_2hex_1)
char ascii[sizeof bcd * 2 + 1];
size_t len = uc_bcd2ascii(bcd, sizeof bcd, ascii);
fail_if(len != 4, "len is %zu", len);
fail_if(ascii[0] != '1',"0 was %c",ascii[0]);
fail_if(ascii[1] != '2',"1 was %c",ascii[1]);
fail_if(ascii[2] != '3',"2 was %c",ascii[2]);
fail_if(ascii[3] != '4',"3 was %c",ascii[3]);
fail_if(ascii[4] != 0, "4 was %c",ascii[4]);
fail_if(UC_ASCII_LEN(sizeof bcd) != len);
ck_assert_int_eq(len, 4);
ck_assert_int_eq(ascii[0], '1');
ck_assert_int_eq(ascii[1], '2');
ck_assert_int_eq(ascii[2], '3');
ck_assert_int_eq(ascii[3], '4');
ck_assert_int_eq(ascii[4], 0);
ck_assert_int_eq(UC_ASCII_LEN(sizeof bcd) , len);
}
END_TEST
@@ -127,14 +127,14 @@ START_TEST (test_2hex_2)
char ascii[sizeof bcd * 2 + 1];
size_t len = uc_bcd2ascii(bcd, sizeof bcd, ascii);
fail_if(len != 6, "len is %zu", len);
fail_if(ascii[0] != '0',"0 was %c",ascii[0]);
fail_if(ascii[1] != 'F',"1 was %c",ascii[1]);
fail_if(ascii[2] != 'F',"2 was %c",ascii[2]);
fail_if(ascii[3] != 'F',"3 was %c",ascii[3]);
fail_if(ascii[4] != '0', "4 was %c",ascii[4]);
fail_if(ascii[5] != '0', "5 was %c",ascii[5]);
fail_if(ascii[6] != 0, "6 was %c",ascii[6]);
ck_assert_int_eq(len , 6);
ck_assert_int_eq(ascii[0] , '0');
ck_assert_int_eq(ascii[1] , 'F');
ck_assert_int_eq(ascii[2] , 'F');
ck_assert_int_eq(ascii[3] , 'F');
ck_assert_int_eq(ascii[4] , '0');
ck_assert_int_eq(ascii[5] , '0');
ck_assert_int_eq(ascii[6] , 0);
}
END_TEST
@@ -146,8 +146,8 @@ START_TEST (test_2hex_empty)
ascii[0] = 0xFF;
size_t len = uc_bcd2ascii(bcd, 0, ascii);
fail_if(len != 0, "len is %zu", len);
fail_if(ascii[0] != 0, "0 was %c",ascii[0]);
ck_assert_int_eq(len, 0);
ck_assert_int_eq(ascii[0], 0);
}
END_TEST
test/test_bitvec.c
+12 -12
View File
@@ -9,7 +9,7 @@ START_TEST (test_bitvec_1)
size_t i;
for (i = 0; i < sizeof s * 8; i++)
fail_if(uc_bv_get_bit(&v, i), "bit %zu is not 0", i);
ck_assert_int_eq(uc_bv_get_bit(&v, i), 0);
}
END_TEST
@@ -23,7 +23,7 @@ START_TEST (test_bitvec_2)
uc_bv_set_bit(&v, i);
for (i = 0; i < sizeof s * 8; i++)
fail_if(uc_bv_get_bit(&v, i) != 1 , "bit %zu is not 1", i);
ck_assert_int_eq(uc_bv_get_bit(&v, i), 1);
}
END_TEST
@@ -34,13 +34,13 @@ START_TEST (test_bitvec_clearbit)
size_t i;
for (i = 0; i < sizeof(uc_bv_integer) * 8; i++)
fail_if(uc_bv_get_bit(&v, i) != 1 , "bit %zu is not 1", i);
ck_assert_int_eq(uc_bv_get_bit(&v, i), 1);
for (i = 0; i < sizeof(uc_bv_integer) * 8; i++)
uc_bv_clr_bit(&v, i);
for (i = 0; i < sizeof(uc_bv_integer) * 8; i++)
fail_if(uc_bv_get_bit(&v, i) != 0 , "bit %zu is not 0", i);
ck_assert_int_eq(uc_bv_get_bit(&v, i), 0);
}
END_TEST
@@ -48,14 +48,14 @@ END_TEST
START_TEST (test_bitvec_set_bits_from_array)
{
struct UCBitVec *v = uc_bv_new(5);
char a[] = {1, 0,1 ,0, 1};
char a[] = {1, 0, 1 ,0, 1};
uc_bv_set_bits_from_array(v,a , 5);
fail_if(uc_bv_get_bit(v, 0) != 1 , "bit 0 is wrong");
fail_if(uc_bv_get_bit(v, 1) != 0 , "bit 1 is wrong");
fail_if(uc_bv_get_bit(v, 2) != 1 , "bit 2 is wrong");
fail_if(uc_bv_get_bit(v, 3) != 0 , "bit 3 is wrong");
fail_if(uc_bv_get_bit(v, 4) != 1 , "bit 4 is wrong");
ck_assert_int_eq(uc_bv_get_bit(v, 0), 1);
ck_assert_int_eq(uc_bv_get_bit(v, 1), 0);
ck_assert_int_eq(uc_bv_get_bit(v, 2), 1);
ck_assert_int_eq(uc_bv_get_bit(v, 3), 0);
ck_assert_int_eq(uc_bv_get_bit(v, 4), 1);
uc_bv_free(v);
}
@@ -70,12 +70,12 @@ START_TEST (test_bitvec_setall_clearall)
uc_bv_set_all(v);
for (i = 0; i < 511; i++)
fail_if(uc_bv_get_bit(v, i) != 1 , "bit %zu is not 1", i);
ck_assert_int_eq(uc_bv_get_bit(v, i), 1);
uc_bv_clr_all(v);
for (i = 0; i < sizeof(uc_bv_integer) * 8; i++)
fail_if(uc_bv_get_bit(v, i) != 0 , "bit %zu is not 0", i);
ck_assert_int_eq(uc_bv_get_bit(v, i), 0);
uc_bv_free(v);
test/test_buffer.c
+8 -8
View File
@@ -60,8 +60,8 @@ START_TEST (test_gbuf_printf1)
fail_if(buf == NULL);
rc = uc_gbuf_printf(buf, "test %d", 1);
fail_if(rc != 6, "rc was %d", rc);
fail_if(buf->used != 6, "buf->used was %zu", buf->used);
fail_if(rc != 6);
fail_if(buf->used != 6);
fail_if(strcmp("test 1", buf->buf) != 0);
uc_gbuf_unref(buf);
@@ -76,8 +76,8 @@ START_TEST (test_gbuf_printf2)
fail_if(buf == NULL);
rc = uc_gbuf_printf(buf, "test %d test %d test %d", 1, 2, 3);
fail_if(rc != 20, "rc was %d", rc);
fail_if(buf->used != 20, "buf->used was %zu", buf->used);
fail_if(rc != 20);
fail_if(buf->used != 20);
fail_if(strcmp("test 1 test 2 test 3", buf->buf) != 0);
uc_gbuf_unref(buf);
@@ -92,14 +92,14 @@ START_TEST (test_gbuf_printf3)
fail_if(buf == NULL);
rc = uc_gbuf_printf(buf, "test %d test %d test %d", 1, 2, 3);
fail_if(rc != 20, "rc was %d", rc);
fail_if(buf->used != 20, "buf->used was %zu", buf->used);
fail_if(rc != 20);
fail_if(buf->used != 20);
fail_if(strcmp("test 1 test 2 test 3", buf->buf) != 0);
rc = uc_gbuf_printf(buf, " test %d test %d", 4, 5);
fail_if(rc != 14, "rc was %d", rc);
fail_if(buf->used != 34, "buf->used was %zu", buf->used);
fail_if(rc != 14);
fail_if(buf->used != 34);
fail_if(strcmp("test 1 test 2 test 3 test 4 test 5", buf->buf) != 0);
uc_gbuf_unref(buf);
test/test_dbuf.c
+2 -2
View File
@@ -33,7 +33,7 @@ START_TEST (test_dbuf)
fail_if(uc_dbuf_remaining(&buf) != 105);
fail_if(uc_dbuf_len(&buf) != 5);
ck_assert_str_eq((char *)buf.start, "ABCD");
uc_dbuf_take(&buf, 5);
fail_if(uc_dbuf_remaining(&buf) != 120);
@@ -154,7 +154,7 @@ START_TEST (test_dbuf_add_ensure_take)
fail_if(rc != 0);
//ok, dbuf adds the ensured capacity to the existing buflen
//so it becomes 100, not 90 even though the buffer is already empty
fail_if(uc_dbuf_remaining(buf) != 100, "remaining %zu", (uc_dbuf_remaining(buf)));
fail_if(uc_dbuf_remaining(buf) != 100);
fail_if(uc_dbuf_buflen(buf) != 100);
memset(buf->end, 0xDE, 90);
uc_dbuf_added(buf, 90);
test/test_hex.c
+14 -14
View File
@@ -22,7 +22,7 @@ START_TEST (test_uc_hex_encode_2)
uc_hex_encode(binary, sizeof binary, hex);
fail_if(strcmp(hex,"7F8081") != 0, "was %s", hex);
fail_if(strcmp(hex,"7F8081") != 0);
}
END_TEST
@@ -34,7 +34,7 @@ START_TEST (test_uc_hex_encode_3)
uc_hex_encode(binary, sizeof binary, hex);
fail_if(strcmp(hex,"0001090B") != 0, "was %s", hex);
fail_if(strcmp(hex,"0001090B") != 0);
}
END_TEST
@@ -62,7 +62,7 @@ START_TEST (test_uc_hex_decode_1)
fail_if(binary[0] != 0x1f);
fail_if(binary[1] != 0x22);
fail_if(res != binary + 1, "binary %p, res %p", &binary[0], res);
fail_if(res != binary + 1);
}
END_TEST
@@ -78,7 +78,7 @@ START_TEST (test_uc_hex_decode_2)
fail_if(binary[0] != 0x00);
fail_if(binary[1] != 0xFF);
fail_if(binary[2] != 0x80);
fail_if(res != binary + 3, "binary %p, res %p", &binary[0], res);
fail_if(res != binary + 3);
}
END_TEST
@@ -110,7 +110,7 @@ START_TEST (test_uc_hex_decode_empty_string)
fail_if(binary[0] != 0x11);
fail_if(binary[1] != 0x11);
fail_if(binary[2] != 0x11);
fail_if(res != binary, "length %zu\n", res - binary);
fail_if(res != binary);
}
END_TEST
@@ -125,7 +125,7 @@ START_TEST (test_uc_hex_decode_spaces)
fail_if(binary[0] != 0x11);
fail_if(binary[1] != 0x12);
fail_if(binary[2] != 0x13);
fail_if(res != binary+3, "length %zu\n", res - binary);
fail_if(res != binary+3);
}
END_TEST
@@ -141,7 +141,7 @@ START_TEST (test_uc_hex_decode_spaces2)
fail_if(binary[0] != 0x11);
fail_if(binary[1] != 0x12);
fail_if(binary[2] != 0x13);
fail_if(res != binary+3, "length %zu\n", res - binary);
fail_if(res != binary+3);
}
END_TEST
@@ -156,7 +156,7 @@ START_TEST (test_uc_hex_decode_spaces_empty)
fail_if(binary[0] != 0x11);
fail_if(binary[1] != 0x12);
fail_if(res != binary, "length %zu\n", res - binary);
fail_if(res != binary);
}
END_TEST
@@ -201,7 +201,7 @@ START_TEST (test_uc_hex_encode_delim_1)
res = uc_hex_encode_delim(binary, sizeof binary, hex, sizeof hex, " ");
fail_if(strcmp(hex, "FF 00 7F 0A ") != 0, "hex was '%s'", hex);
fail_if(strcmp(hex, "FF 00 7F 0A ") != 0);
*res = 0;
fail_if(res != hex + 12);
@@ -216,8 +216,8 @@ START_TEST (test_uc_hex_encode_delim_2)
res = uc_hex_encode_delim(binary, sizeof binary, hex, sizeof hex, " \n");
fail_if(strcmp(hex, "FF \n00 ") != 0, "hex was '%s'", hex);
fail_if(res != hex + 7, "sz was %zu", res - hex);
fail_if(strcmp(hex, "FF \n00 ") != 0);
fail_if(res != hex + 7);
}
END_TEST
@@ -230,7 +230,7 @@ START_TEST (test_uc_hex_encode_delim_zero_len)
res = uc_hex_encode_delim(binary, 0, hex, sizeof hex, " \n");
fail_if(strcmp(hex, "") != 0, "hex was '%s'", hex);
fail_if(strcmp(hex, "") != 0);
fail_if(res != hex);
}
@@ -247,7 +247,7 @@ START_TEST (test_uc_hex_decode_lowercase)
fail_if(binary[0] != 0x1f);
fail_if(binary[1] != 0x22);
fail_if(res != binary + 1, "binary %p, res %p", &binary[0], res);
fail_if(res != binary + 1);
}
END_TEST
@@ -263,7 +263,7 @@ Suite *hex_suite(void)
tcase_add_test(tc, test_uc_hex_encode_delim_1);
tcase_add_test(tc, test_uc_hex_encode_delim_2);
tcase_add_test(tc, test_uc_hex_encode_delim_zero_len);
tcase_add_test(tc, test_uc_hex_decode_1);
tcase_add_test(tc, test_uc_hex_decode_2);
test/test_logging.c
+35 -35
View File
@@ -61,7 +61,7 @@ START_TEST (test_logfile_location)
UC_LOGF(UC_LL_ERROR, 0, "Lorum ipson 5");
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(rc != 0);
}
END_TEST
@@ -96,8 +96,8 @@ START_TEST (test_logfile_delete_destination)
UC_LOGF(UC_LL_ERROR, 0, "Lorum ipson 5");
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 260, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 260);
uc_log_delete_destination(dest);
@@ -109,8 +109,8 @@ START_TEST (test_logfile_delete_destination)
//since we deleted destinatiion, no more logging should appear in the file
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 260, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 260);
}
END_TEST
@@ -142,8 +142,8 @@ START_TEST (test_logfile_no_location)
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 52*2, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 52*2);
}
END_TEST
@@ -175,9 +175,9 @@ START_TEST (test_logfile_loglevel_surpressed_dest)
UC_LOGF(UC_LL_INFO, 1, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(rc != 0);
fail_if(st.st_size != 0, "was %ld", (long)st.st_size);
fail_if(st.st_size != 0);
}
END_TEST
@@ -209,9 +209,9 @@ START_TEST (test_logfile_loglevel_surpressed_module)
UC_LOGF(UC_LL_INFO, 0, "Lorum ipson %d", 100);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(rc != 0);
fail_if(st.st_size != 0, "was %ld", (long)st.st_size);
fail_if(st.st_size != 0);
}
END_TEST
@@ -242,20 +242,20 @@ START_TEST (test_logfile_reopen_files)
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 104, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 104);
rc = remove(FILE_NAME);
fail_if(rc != 0, "Remove failed %s", strerror(errno));
fail_if(rc != 0);
rc = uc_log_reopen_files();
fail_if(rc != 0, "uc_log_reopen_files failed: %d", rc);
fail_if(rc != 0);
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "2. stat failed: %s", strerror(errno));
fail_if(st.st_size != 52, "was %ld", (long)st.st_size);//should only one line there now
fail_if(rc != 0);
fail_if(st.st_size != 52);//should only one line there now
}
END_TEST
@@ -293,16 +293,16 @@ START_TEST (test_logfile_remove_dest)
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 104, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 104);
uc_log_remove_destination(dest1);
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1); //should not be logged now
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "2. stat failed: %s", strerror(errno));
fail_if(st.st_size != 104, "was %ld", (long)st.st_size);//should be same size
fail_if(rc != 0);
fail_if(st.st_size != 104);//should be same size
//removing the last destination should be fine too
uc_log_remove_destination(dest2);
@@ -310,8 +310,8 @@ START_TEST (test_logfile_remove_dest)
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "2. stat failed: %s", strerror(errno));
fail_if(st.st_size != 104, "was %ld", (long)st.st_size);//should be same size
fail_if(rc != 0);
fail_if(st.st_size != 104);//should be same size
}
END_TEST
@@ -336,7 +336,7 @@ START_TEST (test_logfile_full_filesystem)
uc_log_init(&mods);
dest = uc_log_new_file("/dev/full", UC_LL_DEBUG, 1);
fail_if(dest == NULL, "Cannot open /dev/full");
fail_if(dest == NULL);
uc_log_add_destination(dest);
for (i = 0; i < 1024; i++) {
@@ -396,7 +396,7 @@ START_TEST (test_logfile_invalid_file_after_reopen)
logging_rm_subdir();
rc = access(SUBDIR_FILE_NAME, W_OK);
fail_if(rc == 0, "Test setup is wrong. Can still access" SUBDIR_FILE_NAME "");
fail_if(rc == 0);
UC_LOGF(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
UC_LOGF(UC_LL_WARNING, 0, "Lorum ipson %d", 1);
@@ -439,8 +439,8 @@ START_TEST (test_logfile_raw)
UC_LOGFR(UC_LL_DEBUG, 0, "Lorum ipson %d\n", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 14*2, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 14*2);
}
END_TEST
@@ -479,16 +479,16 @@ START_TEST (test_logfile_dest_mask)
UC_LOGFR(UC_LL_DEBUG, 0, "Lorum ipson %d", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 0, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 0);
uc_log_destination_set_mask(dest, "MOD1=DEBUG:mod2=Debug");
UC_LOGFR(UC_LL_DEBUG, 0, "Lorum ipson %d\n", 1);
UC_LOGFR(UC_LL_DEBUG, 1, "Lorum ipson %d\n", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 14*2, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 14*2);
}
END_TEST
@@ -518,8 +518,8 @@ START_TEST (test_loglevel_module_none)
UC_LOGFR(UC_LL_ERROR, 0, "Lorum ipson %d\n", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 0, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 0);
}
END_TEST
@@ -549,8 +549,8 @@ START_TEST (test_loglevel_dest_none)
UC_LOGFR(UC_LL_WARNING, 0, "Lorum ipson %d\n", 1);
rc = stat(FILE_NAME, &st);
fail_if(rc != 0, "stat failed: %s", strerror(errno));
fail_if(st.st_size != 0, "was %ld", (long)st.st_size);
fail_if(rc != 0);
fail_if(st.st_size != 0);
}
END_TEST
test/test_pack.c
+84 -84
View File
@@ -9,8 +9,8 @@ START_TEST (test_pack16_le_1)
uc_pack_16_le(v,r);
fail_if(r[0] != 0x34,"was 0x%x",r[0]);
fail_if(r[1] != 0x12,"was 0x%x",r[1]);
fail_if(r[0] != 0x34);
fail_if(r[1] != 0x12);
}
END_TEST
@@ -21,8 +21,8 @@ START_TEST (test_pack16_le_2)
uc_pack_16_le(v,r);
fail_if(r[0] != 0xEF,"was 0x%x",r[0]);
fail_if(r[1] != 0xFE,"was 0x%x",r[1]);
fail_if(r[0] != 0xEF);
fail_if(r[1] != 0xFE);
}
END_TEST
@@ -33,8 +33,8 @@ START_TEST (test_pack16_be_1)
uc_pack_16_be(v,r);
fail_if(r[0] != 0x12,"was 0x%x",r[0]);
fail_if(r[1] != 0x34,"was 0x%x",r[1]);
fail_if(r[0] != 0x12);
fail_if(r[1] != 0x34);
}
END_TEST
@@ -45,8 +45,8 @@ START_TEST (test_pack16_be_2)
uc_pack_16_be(v, r);
fail_if(r[0] != 0xFE,"was 0x%x",r[0]);
fail_if(r[1] != 0xEF,"was 0x%x",r[1]);
fail_if(r[0] != 0xFE);
fail_if(r[1] != 0xEF);
}
END_TEST
@@ -57,7 +57,7 @@ START_TEST (test_unpack16_le_1)
v = uc_unpack_16_le(r);
fail_if(v != 0x3412,"was 0x%x",v);
fail_if(v != 0x3412);
}
END_TEST
@@ -68,7 +68,7 @@ START_TEST (test_unpack16_le_2)
v = uc_unpack_16_le(r);
fail_if(v != 0xEFFE,"was 0x%x",v);
fail_if(v != 0xEFFE);
}
END_TEST
@@ -79,7 +79,7 @@ START_TEST (test_unpack16_be_1)
v = uc_unpack_16_be(r);
fail_if(v != 0x1234,"was 0x%x",v);
fail_if(v != 0x1234);
}
END_TEST
@@ -90,7 +90,7 @@ START_TEST (test_unpack16_be_2)
v = uc_unpack_16_be(r);
fail_if(v != 0xFEEF,"was 0x%x",v);
fail_if(v != 0xFEEF);
}
END_TEST
@@ -101,9 +101,9 @@ START_TEST (test_pack24_le_1)
uc_pack_24_le(v,r);
fail_if(r[0] != 0x56,"was 0x%x",r[0]);
fail_if(r[1] != 0x34,"was 0x%x",r[1]);
fail_if(r[2] != 0x12,"was 0x%x",r[2]);
fail_if(r[0] != 0x56);
fail_if(r[1] != 0x34);
fail_if(r[2] != 0x12);
}
END_TEST
@@ -114,9 +114,9 @@ START_TEST (test_pack24_le_2)
uc_pack_24_le(v,r);
fail_if(r[0] != 0xF6,"was 0x%x",r[0]);
fail_if(r[1] != 0xF7,"was 0x%x",r[1]);
fail_if(r[2] != 0xF8,"was 0x%x",r[2]);
fail_if(r[0] != 0xF6);
fail_if(r[1] != 0xF7);
fail_if(r[2] != 0xF8);
}
END_TEST
@@ -127,9 +127,9 @@ START_TEST (test_pack24_be_1)
uc_pack_24_be(v,r);
fail_if(r[0] != 0x12,"was 0x%x",r[0]);
fail_if(r[1] != 0x34,"was 0x%x",r[1]);
fail_if(r[2] != 0x56,"was 0x%x",r[2]);
fail_if(r[0] != 0x12);
fail_if(r[1] != 0x34);
fail_if(r[2] != 0x56);
}
END_TEST
@@ -140,9 +140,9 @@ START_TEST (test_pack24_be_2)
uc_pack_24_be(v,r);
fail_if(r[0] != 0xF8,"was 0x%x",r[0]);
fail_if(r[1] != 0xF7,"was 0x%x",r[1]);
fail_if(r[2] != 0xF6,"was 0x%x",r[2]);
fail_if(r[0] != 0xF8);
fail_if(r[1] != 0xF7);
fail_if(r[2] != 0xF6);
}
END_TEST
@@ -153,10 +153,10 @@ START_TEST (test_pack32_le_1)
uc_pack_32_le(v,r);
fail_if(r[0] != 0x78,"was 0x%x",r[0]);
fail_if(r[1] != 0x56,"was 0x%x",r[1]);
fail_if(r[2] != 0x34,"was 0x%x",r[2]);
fail_if(r[3] != 0x12,"was 0x%x",r[3]);
fail_if(r[0] != 0x78);
fail_if(r[1] != 0x56);
fail_if(r[2] != 0x34);
fail_if(r[3] != 0x12);
}
END_TEST
@@ -167,10 +167,10 @@ START_TEST (test_pack32_le_2)
uc_pack_32_le(v,r);
fail_if(r[0] != 0xF4,"was 0x%x",r[0]);
fail_if(r[1] != 0xF6,"was 0x%x",r[1]);
fail_if(r[2] != 0xF7,"was 0x%x",r[2]);
fail_if(r[3] != 0xF8,"was 0x%x",r[3]);
fail_if(r[0] != 0xF4);
fail_if(r[1] != 0xF6);
fail_if(r[2] != 0xF7);
fail_if(r[3] != 0xF8);
}
END_TEST
@@ -181,10 +181,10 @@ START_TEST (test_pack32_be_1)
uc_pack_32_be(v,r);
fail_if(r[3] != 0x78,"was 0x%x",r[3]);
fail_if(r[2] != 0x56,"was 0x%x",r[2]);
fail_if(r[1] != 0x34,"was 0x%x",r[1]);
fail_if(r[0] != 0x12,"was 0x%x",r[0]);
fail_if(r[3] != 0x78);
fail_if(r[2] != 0x56);
fail_if(r[1] != 0x34);
fail_if(r[0] != 0x12);
}
END_TEST
@@ -195,10 +195,10 @@ START_TEST (test_pack32_be_2)
uc_pack_32_be(v,r);
fail_if(r[3] != 0xF4,"was 0x%x",r[3]);
fail_if(r[2] != 0xF6,"was 0x%x",r[2]);
fail_if(r[1] != 0xF7,"was 0x%x",r[1]);
fail_if(r[0] != 0xF8,"was 0x%x",r[0]);
fail_if(r[3] != 0xF4);
fail_if(r[2] != 0xF6);
fail_if(r[1] != 0xF7);
fail_if(r[0] != 0xF8);
}
END_TEST
@@ -209,7 +209,7 @@ START_TEST (test_unpack24_le_1)
v = uc_unpack_24_le(r);
fail_if(v != 0x563412,"was 0x%x",v);
fail_if(v != 0x563412);
}
END_TEST
@@ -220,7 +220,7 @@ START_TEST (test_unpack24_le_2)
v = uc_unpack_24_le(r);
fail_if(v != 0xF6F7F8,"was 0x%x",v);
fail_if(v != 0xF6F7F8);
}
END_TEST
@@ -231,7 +231,7 @@ START_TEST (test_unpack24_be_1)
v = uc_unpack_24_be(r);
fail_if(v != 0x123456,"was 0x%x",v);
fail_if(v != 0x123456);
}
END_TEST
@@ -242,7 +242,7 @@ START_TEST (test_unpack24_be_2)
v = uc_unpack_24_be(r);
fail_if(v != 0xF8F7F6,"was 0x%x",v);
fail_if(v != 0xF8F7F6);
}
END_TEST
@@ -253,7 +253,7 @@ START_TEST (test_unpack32_le_1)
v = uc_unpack_32_le(r);
fail_if(v != 0x78563412,"was 0x%x",v);
fail_if(v != 0x78563412);
}
END_TEST
@@ -264,7 +264,7 @@ START_TEST (test_unpack32_le_2)
v = uc_unpack_32_le(r);
fail_if(v != 0xF4F6F7F8,"was 0x%x",v);
fail_if(v != 0xF4F6F7F8);
}
END_TEST
@@ -275,7 +275,7 @@ START_TEST (test_unpack32_be_1)
v = uc_unpack_32_be(r);
fail_if(v != 0x12345678,"was 0x%x",v);
fail_if(v != 0x12345678);
}
END_TEST
@@ -286,7 +286,7 @@ START_TEST (test_unpack32_be_2)
v = uc_unpack_32_be(r);
fail_if(v != 0xF8F7F6F4,"was 0x%x",v);
fail_if(v != 0xF8F7F6F4);
}
END_TEST
@@ -297,14 +297,14 @@ START_TEST (test_pack64_le_1)
uc_pack_64_le(v, r);
fail_if(r[0] != 0x88,"was 0x%x",r[0]);
fail_if(r[1] != 0x77,"was 0x%x",r[1]);
fail_if(r[2] != 0x66,"was 0x%x",r[2]);
fail_if(r[3] != 0x55,"was 0x%x",r[3]);
fail_if(r[4] != 0x44,"was 0x%x",r[4]);
fail_if(r[5] != 0x33,"was 0x%x",r[5]);
fail_if(r[6] != 0x22,"was 0x%x",r[6]);
fail_if(r[7] != 0x11,"was 0x%x",r[7]);
fail_if(r[0] != 0x88);
fail_if(r[1] != 0x77);
fail_if(r[2] != 0x66);
fail_if(r[3] != 0x55);
fail_if(r[4] != 0x44);
fail_if(r[5] != 0x33);
fail_if(r[6] != 0x22);
fail_if(r[7] != 0x11);
}
END_TEST
@@ -315,14 +315,14 @@ START_TEST (test_pack64_le_2)
uc_pack_64_le(v, r);
fail_if(r[0] != 0xF8,"was 0x%x",r[0]);
fail_if(r[1] != 0xF9,"was 0x%x",r[1]);
fail_if(r[2] != 0xFA,"was 0x%x",r[2]);
fail_if(r[3] != 0xFB,"was 0x%x",r[3]);
fail_if(r[4] != 0xFC,"was 0x%x",r[4]);
fail_if(r[5] != 0xFD,"was 0x%x",r[5]);
fail_if(r[6] != 0xFE,"was 0x%x",r[6]);
fail_if(r[7] != 0xFF,"was 0x%x",r[7]);
fail_if(r[0] != 0xF8);
fail_if(r[1] != 0xF9);
fail_if(r[2] != 0xFA);
fail_if(r[3] != 0xFB);
fail_if(r[4] != 0xFC);
fail_if(r[5] != 0xFD);
fail_if(r[6] != 0xFE);
fail_if(r[7] != 0xFF);
}
END_TEST
@@ -333,7 +333,7 @@ START_TEST (test_unpack64_le_1)
v = uc_unpack_64_le(r);
fail_if(v != 0x8877665544332211ULL,"was 0x%llx",v);
fail_if(v != 0x8877665544332211ULL);
}
END_TEST
@@ -345,7 +345,7 @@ START_TEST (test_unpack64_le_2)
v = uc_unpack_64_le(r);
fail_if(v != 0xF8F9FAFBFCFDFEFFULL,"was 0x%llx",v);
fail_if(v != 0xF8F9FAFBFCFDFEFFULL);
}
END_TEST
@@ -356,14 +356,14 @@ START_TEST (test_pack64_be_1)
uc_pack_64_be(v, r);
fail_if(r[0] != 0x11,"was 0x%x",r[0]);
fail_if(r[1] != 0x22,"was 0x%x",r[1]);
fail_if(r[2] != 0x33,"was 0x%x",r[2]);
fail_if(r[3] != 0x44,"was 0x%x",r[3]);
fail_if(r[4] != 0x55,"was 0x%x",r[4]);
fail_if(r[5] != 0x66,"was 0x%x",r[5]);
fail_if(r[6] != 0x77,"was 0x%x",r[6]);
fail_if(r[7] != 0x88,"was 0x%x",r[7]);
fail_if(r[0] != 0x11);
fail_if(r[1] != 0x22);
fail_if(r[2] != 0x33);
fail_if(r[3] != 0x44);
fail_if(r[4] != 0x55);
fail_if(r[5] != 0x66);
fail_if(r[6] != 0x77);
fail_if(r[7] != 0x88);
}
END_TEST
@@ -374,14 +374,14 @@ START_TEST (test_pack64_be_2)
uc_pack_64_be(v, r);
fail_if(r[0] != 0xFF,"was 0x%x",r[0]);
fail_if(r[1] != 0xFE,"was 0x%x",r[1]);
fail_if(r[2] != 0xFD,"was 0x%x",r[2]);
fail_if(r[3] != 0xFC,"was 0x%x",r[3]);
fail_if(r[4] != 0xFB,"was 0x%x",r[4]);
fail_if(r[5] != 0xFA,"was 0x%x",r[5]);
fail_if(r[6] != 0xF9,"was 0x%x",r[6]);
fail_if(r[7] != 0xF8,"was 0x%x",r[7]);
fail_if(r[0] != 0xFF);
fail_if(r[1] != 0xFE);
fail_if(r[2] != 0xFD);
fail_if(r[3] != 0xFC);
fail_if(r[4] != 0xFB);
fail_if(r[5] != 0xFA);
fail_if(r[6] != 0xF9);
fail_if(r[7] != 0xF8);
}
END_TEST
@@ -392,7 +392,7 @@ START_TEST (test_unpack64_be_1)
v = uc_unpack_64_be(r);
fail_if(v != 0x1122334455667788ULL,"was 0x%llx",v);
fail_if(v != 0x1122334455667788ULL);
}
END_TEST
@@ -403,7 +403,7 @@ START_TEST (test_unpack64_be_2)
v = uc_unpack_64_be(r);
fail_if(v != 0xFFFEFDFCFBFAF9F8ULL,"was 0x%llx",v);
fail_if(v != 0xFFFEFDFCFBFAF9F8ULL);
}
END_TEST
test/test_ratelimit.c
+1 -1
View File
@@ -10,7 +10,7 @@ START_TEST (test_ratelimit_1)
uc_ratelimit_init(&r, 30, 2);
for (i = 0; i < 30; i++) {
fail_if(!uc_ratelimit_allow(&r, now), "i = %d", i);
fail_if(!uc_ratelimit_allow(&r, now));
}
fail_if(uc_ratelimit_allow(&r, now));
}
test/test_read_file.c
+25 -25
View File
@@ -18,8 +18,8 @@ START_TEST (test_read_file_non_existing_file)
content = uc_read_file("non existing file 123765", &len, 1000000000);
saved_errno = errno;
fail_if(content != NULL);
fail_if(saved_errno == 0);
ck_assert_ptr_null(content);
ck_assert_int_ne(saved_errno, 0);
}
END_TEST
@@ -31,20 +31,20 @@ START_TEST (test_read_file_simple)
ssize_t rc;
int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0664);
fail_if(fd == -1);
ck_assert_int_ne(fd, -1);
rc = write(fd, "hello", 5);
fail_if(rc != 5, "rc was %ld", (long)rc);
ck_assert_int_eq(rc, 5);
close(fd);
content = uc_read_file(filename, &len, 1000000000);
unlink(filename);
fail_if(content == NULL);
fail_if(len != 5);
fail_if(strlen(content) != 5);
fail_if(strcmp("hello", content) != 0);
ck_assert_ptr_nonnull(content);
ck_assert_uint_eq(len, 5);
ck_assert_uint_eq(strlen(content), 5);
ck_assert_str_eq("hello", content);
free(content);
}
END_TEST
@@ -61,7 +61,7 @@ START_TEST (test_read_file_greater_than_max)
fail_if(fd == -1);
rc = write(fd, "hello", 5);
fail_if(rc != 5, "rc was %ld", (long)rc);
fail_if(rc != 5);
close(fd);
@@ -69,8 +69,8 @@ START_TEST (test_read_file_greater_than_max)
saved_errno = errno;
unlink(filename);
fail_if(content != NULL);
fail_if(saved_errno != EMSGSIZE, "was %d", saved_errno);
ck_assert_ptr_null(content);
ck_assert_int_eq(saved_errno, EMSGSIZE);
}
END_TEST
@@ -87,16 +87,16 @@ START_TEST (test_read_file_boundary)
fail_if(fd == -1);
rc = write(fd, buf, sizeof buf);
fail_if(rc != sizeof buf, "rc was %ld", (long)rc);
ck_assert_uint_eq(rc, sizeof buf);
close(fd);
content = uc_read_file(filename, &len, 1000000000);
unlink(filename);
fail_if(content == NULL);
fail_if(len != sizeof buf);
fail_if(strcmp("foobar", &content[1022]) != 0);
ck_assert_ptr_nonnull(content);
ck_assert_uint_eq(len, sizeof buf);
ck_assert_str_eq("foobar", &content[1022]);
free(content);
}
END_TEST
@@ -107,10 +107,10 @@ START_TEST (test_read_file_devnull)
size_t len = 123;
content = uc_read_file("/dev/null", &len, 1024);
fail_if(content == NULL);
fail_if(len != 0);
ck_assert_ptr_nonnull(content);
ck_assert_uint_eq(len, 0);
free(content);
}
END_TEST
@@ -125,14 +125,14 @@ START_TEST (test_read_file_too_big)
fail_if(fd == -1);
rc = write(fd, "hello", 5);
fail_if(rc != 5, "rc was %ld", (long)rc);
fail_if(rc != 5);
close(fd);
content = uc_read_file(filename, &len, 4);
fail_if(errno != EMSGSIZE);
fail_if(content != NULL);
ck_assert_int_eq(errno, EMSGSIZE);
ck_assert_ptr_null(content);
unlink(filename);
}
@@ -147,18 +147,18 @@ START_TEST (test_read_file_big)
ssize_t rc;
int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0664);
fail_if(fd == -1);
ck_assert_int_ne(fd, -1);
memset(buf, 'a', sizeof buf);
rc = write(fd, buf, sizeof buf);
fail_if(rc != sizeof buf, "rc was %ld", (long)rc);
ck_assert_uint_eq(rc, sizeof buf);
close(fd);
content = uc_read_file(filename, &len, 4096*16);
fail_if(content == NULL);
fail_if(len != sizeof buf);
fail_if(memcmp(content, buf, sizeof buf) != 0);
ck_assert_uint_eq(len, sizeof buf);
ck_assert_int_eq(memcmp(content, buf, sizeof buf), 0);
free(content);
test/test_restart_file.c
+1 -1
View File
@@ -82,7 +82,7 @@ START_TEST (test_restart_counter_garble)
ck_assert_int_eq(0, uc_restart_counter_get(&cnt));
rc = uc_restart_counter_init(&cnt, FILE_NAME, 0);
fail_if(rc != UC_RC_OK, "%d", rc);
fail_if(rc != UC_RC_OK);
ck_assert_int_eq(1, uc_restart_counter_get(&cnt));
}