From a91fab8e160c4717b184b9963537f68b353cb173 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 4 Mar 2010 14:12:51 +0100 Subject: Add stringify header --- stringify/stringify.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 stringify/stringify.h diff --git a/stringify/stringify.h b/stringify/stringify.h new file mode 100644 index 0000000..5b7b002 --- /dev/null +++ b/stringify/stringify.h @@ -0,0 +1,15 @@ +/* Taken from Linux Kernel source code */ + +#ifndef _STRINGIFY_H_ +#define _STRINGIFY_H_ + +/* + * Indirect stringification. Doing two levels allows the parameter to be a + * macro itself. For example, compile with -DFOO=bar, __stringify(FOO) + * converts to "bar". + */ + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +#endif /* _STRINGIFY_H_ */ -- cgit v1.2.3-54-g00ecf From de1c4780206373f857a877dfed3940de3cbef2c5 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 4 Mar 2010 14:16:24 +0100 Subject: Add CRC32 algorithm --- crc32/crc32.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ crc32/crc32.h | 8 +++++++ 2 files changed, 79 insertions(+) create mode 100644 crc32/crc32.c create mode 100644 crc32/crc32.h diff --git a/crc32/crc32.c b/crc32/crc32.c new file mode 100644 index 0000000..6e0c87d --- /dev/null +++ b/crc32/crc32.c @@ -0,0 +1,71 @@ +#include +#include + +#include "crc32.h" + +/* Table computed with Mark Adler's makecrc.c utility. */ +static const uint32_t crc32_table[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, + 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, + 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, + 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, + 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, + 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, + 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, + 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, + 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, + 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, + 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, + 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, + 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, + 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, + 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, + 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, + 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, + 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, + 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, + 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, + 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, + 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, + 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, + 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, + 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, + 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, + 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, + 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, + 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, + 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, + 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, + 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, + 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, + 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, + 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, + 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, + 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, + 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, + 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, + 0x2d02ef8d +}; + +uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len) +{ + const uint8_t *end; + + crc = ~crc; + for (end = buf + len; buf < end; buf++) + crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8); + + return ~crc; +} diff --git a/crc32/crc32.h b/crc32/crc32.h new file mode 100644 index 0000000..6ea89b0 --- /dev/null +++ b/crc32/crc32.h @@ -0,0 +1,8 @@ +#ifndef _CRC32_H_ +#define _CRC32_H_ + +#include + +extern uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len); + +#endif /* _CRC32_H_ */ -- cgit v1.2.3-54-g00ecf From a1d2d05ddc38c091e4dc9ff750c0d141995e46dc Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 5 Mar 2010 11:04:40 +0100 Subject: Add memdebug module, a simple malloc debugger --- memdebug/memdebug.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++ memdebug/memdebug.h | 44 ++++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 memdebug/memdebug.c create mode 100644 memdebug/memdebug.h diff --git a/memdebug/memdebug.c b/memdebug/memdebug.c new file mode 100644 index 0000000..9725cb1 --- /dev/null +++ b/memdebug/memdebug.c @@ -0,0 +1,113 @@ +#include +#include + +/* define/undef to enable tracing of errors */ +#define MEMDEBUG_TRACE +/* define/undef to enable tracing of double free errors */ +#define MEMDEBUG_TRACE_DOUBLE_FREE + +#include "memdebug.h" + +static struct memdebug_heap_item *heap_head = NULL; +static struct memdebug_heap_item *heap_tail = NULL; + +void *__memdebug_malloc(size_t size, const char *func, + const char *file, const unsigned int line) +{ + void *ret; + struct memdebug_heap_item *hi = malloc(sizeof(struct memdebug_heap_item)); + + if (!hi) + goto out_err; + + ret = malloc(size); + if (!ret) { + free(hi); + goto out_err; + } + + hi->next = NULL; + hi->addr = ret; + hi->size = size; + hi->func = func; + hi->file = file; + hi->line = line; +#ifdef MEMDEBUG_TRACE_DOUBLE_FREE + hi->freed_func = NULL; + hi->freed_file = NULL; + hi->line = 0; +#endif + + if (!heap_head) + heap_head = hi; + if (!heap_tail) + heap_tail = hi; + else { + heap_tail->next = hi; + heap_tail = hi; + } + + return ret; + +out_err: + memdebug_trace("malloc failed (%s:%d:%s)", file, line, func); + return NULL; +} + +void __memdebug_free(void *ptr, const char *func, + const char *file, const unsigned int line) +{ + struct memdebug_heap_item *hi, *prev; + + if (!ptr) { + memdebug_trace("trying to free NULL pointer (%s:%d:%s)", file, line, func); + return; + } + + for (hi = heap_head, prev = NULL; hi; prev = hi, hi = hi->next) + if (hi->addr ==ptr) + break; + + if (!hi) { + memdebug_trace("no memory allocated at %p (%s:%d:%s)", ptr, file, line, func); + return; + } + +#ifdef MEMDEBUG_TRACE_DOUBLE_FREE + if (hi->freed_func) { + memdebug_trace("double free at %p (%s:%d:%s)\nalready freed by %s:%d:%s", + ptr, file, line, func, hi->freed_file, hi->freed_line, hi->freed_func); + return; + } + + hi->freed_func = func; + hi->freed_file = file; + hi->freed_line = line; +#else + /* Delete the item from the linked list */ + if (prev) + prev->next = hi->next; + else + heap_head = hi->next; + if (heap_tail == hi) + heap_tail = prev; + + free(hi); +#endif + + free(ptr); +} + +void memdebug_report(void) +{ + struct memdebug_heap_item *hi; + size_t total_size = 0; + + fprintf(stderr, "\n\n*** Reporting allocated memory ***\n"); + for (hi = heap_head; hi; hi = hi->next) { + fprintf(stderr, " %zu bytes at %p (%s:%d:%s)\n", hi->size, hi->addr, hi->file, hi->line, hi->func); + total_size += hi->size; + } + fprintf(stderr, "Total size: %zu bytes\n\n", total_size); + fflush(stderr); +} diff --git a/memdebug/memdebug.h b/memdebug/memdebug.h new file mode 100644 index 0000000..d96e356 --- /dev/null +++ b/memdebug/memdebug.h @@ -0,0 +1,44 @@ +#ifndef _MEMDEBUG_H_ +#define _MEMDEBUG_H_ + +#include + +#ifdef MEMDEBUG_TRACE +# define memdebug_trace(fmt, args...) \ + ({ \ + fprintf(stderr, "\n\n*** " fmt " ***\n\n", ##args); \ + fflush(stderr); \ + }) +#else +# define memdebug_trace(fmt, args...) +#endif + +struct memdebug_heap_item { + struct memdebug_heap_item *next; + + void *addr; + size_t size; + + const char *func; + const char *file; + unsigned int line; + +#ifdef MEMDEBUG_TRACE_DOUBLE_FREE + const char *freed_func; + const char *freed_file; + unsigned int freed_line; +#endif +}; + +#define memdebug_malloc(size) \ + __memdebug_malloc(size, __func__, __FILE__, __LINE__) +#define memdebug_free(ptr) \ + __memdebug_free(ptr, __func__, __FILE__, __LINE__) + +void *__memdebug_malloc(size_t size, const char *func, + const char *file, const unsigned int line); +void __memdebug_free(void *ptr, const char *func, + const char *file, const unsigned int line); +void memdebug_report(void); + +#endif /* _MEMDEBUG_H_ */ -- cgit v1.2.3-54-g00ecf From 9a0f4b01e9ccdd0733a31dd09b045624eda75c5f Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 5 Mar 2010 11:07:04 +0100 Subject: memdebug: Add file header --- memdebug/memdebug.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/memdebug/memdebug.c b/memdebug/memdebug.c index 9725cb1..50a46fc 100644 --- a/memdebug/memdebug.c +++ b/memdebug/memdebug.c @@ -1,3 +1,12 @@ +/* + * memdebug - A simple malloc/free debugger + * + * This can essentially be useful on embedded systems platforms where tools such + * as valgrind are not available. + * + * Copyright (c) 2010, Tobias Klauser + */ + #include #include -- cgit v1.2.3-54-g00ecf From dbd23d3a6263ad4c79915757b903835ab5ab28d0 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 5 Mar 2010 11:20:33 +0100 Subject: No double \n --- memdebug/memdebug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/memdebug/memdebug.h b/memdebug/memdebug.h index d96e356..3ae1159 100644 --- a/memdebug/memdebug.h +++ b/memdebug/memdebug.h @@ -6,7 +6,7 @@ #ifdef MEMDEBUG_TRACE # define memdebug_trace(fmt, args...) \ ({ \ - fprintf(stderr, "\n\n*** " fmt " ***\n\n", ##args); \ + fprintf(stderr, "*** " fmt " ***\n", ##args); \ fflush(stderr); \ }) #else -- cgit v1.2.3-54-g00ecf From 0a2822d4ad8721673e31d122549e9426105b0289 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 8 Mar 2010 23:08:41 +0100 Subject: memdebug rework --- memdebug/memdebug.c | 67 +++++++++++++++++++++++++++++++---------------------- memdebug/memdebug.h | 4 +--- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/memdebug/memdebug.c b/memdebug/memdebug.c index 50a46fc..84a2c86 100644 --- a/memdebug/memdebug.c +++ b/memdebug/memdebug.c @@ -12,14 +12,31 @@ /* define/undef to enable tracing of errors */ #define MEMDEBUG_TRACE -/* define/undef to enable tracing of double free errors */ -#define MEMDEBUG_TRACE_DOUBLE_FREE #include "memdebug.h" static struct memdebug_heap_item *heap_head = NULL; static struct memdebug_heap_item *heap_tail = NULL; +void memdebug_start(void) +{ + /* Empty for now */ +} + +void memdebug_cleanup(void) +{ + struct memdebug_heap_item *hi; + + for (hi = heap_head; hi; hi = hi->next) { + if (hi->addr) + free(hi->addr); + free(hi); + } + + heap_head = NULL; + heap_tail = NULL; +} + void *__memdebug_malloc(size_t size, const char *func, const char *file, const unsigned int line) { @@ -41,20 +58,15 @@ void *__memdebug_malloc(size_t size, const char *func, hi->func = func; hi->file = file; hi->line = line; -#ifdef MEMDEBUG_TRACE_DOUBLE_FREE hi->freed_func = NULL; hi->freed_file = NULL; hi->line = 0; -#endif if (!heap_head) heap_head = hi; - if (!heap_tail) - heap_tail = hi; - else { + if (heap_tail) heap_tail->next = hi; - heap_tail = hi; - } + heap_tail = hi; return ret; @@ -74,7 +86,7 @@ void __memdebug_free(void *ptr, const char *func, } for (hi = heap_head, prev = NULL; hi; prev = hi, hi = hi->next) - if (hi->addr ==ptr) + if (hi->addr == ptr) break; if (!hi) { @@ -82,7 +94,6 @@ void __memdebug_free(void *ptr, const char *func, return; } -#ifdef MEMDEBUG_TRACE_DOUBLE_FREE if (hi->freed_func) { memdebug_trace("double free at %p (%s:%d:%s)\nalready freed by %s:%d:%s", ptr, file, line, func, hi->freed_file, hi->freed_line, hi->freed_func); @@ -92,31 +103,31 @@ void __memdebug_free(void *ptr, const char *func, hi->freed_func = func; hi->freed_file = file; hi->freed_line = line; -#else - /* Delete the item from the linked list */ - if (prev) - prev->next = hi->next; - else - heap_head = hi->next; - if (heap_tail == hi) - heap_tail = prev; - - free(hi); -#endif - - free(ptr); + + /* Free the memory but keep the memdebug information */ + free(hi->addr); + hi->addr = NULL; } -void memdebug_report(void) +void memdebug_report(int report_all) { struct memdebug_heap_item *hi; size_t total_size = 0; + size_t still_allocated = 0; - fprintf(stderr, "\n\n*** Reporting allocated memory ***\n"); + fprintf(stderr, "\n\n*** Reporting allocated/freed memory ***\n"); for (hi = heap_head; hi; hi = hi->next) { - fprintf(stderr, " %zu bytes at %p (%s:%d:%s)\n", hi->size, hi->addr, hi->file, hi->line, hi->func); + if (hi->addr) { + fprintf(stderr, " IN USE %zu bytes at %p (%s:%d:%s)\n", + hi->size, hi->addr, hi->file, hi->line, hi->func); + still_allocated += hi->size; + } else if (report_all) { + fprintf(stderr, " FREE %zu bytes at %p (%s:%d:%s)\n", + hi->size, hi->addr, hi->file, hi->line, hi->func); + } total_size += hi->size; } - fprintf(stderr, "Total size: %zu bytes\n\n", total_size); + fprintf(stderr, "Total size: %zu bytes, %zu bytes still allocated\n\n", + total_size, still_allocated); fflush(stderr); } diff --git a/memdebug/memdebug.h b/memdebug/memdebug.h index 3ae1159..7a816c0 100644 --- a/memdebug/memdebug.h +++ b/memdebug/memdebug.h @@ -23,11 +23,9 @@ struct memdebug_heap_item { const char *file; unsigned int line; -#ifdef MEMDEBUG_TRACE_DOUBLE_FREE const char *freed_func; const char *freed_file; unsigned int freed_line; -#endif }; #define memdebug_malloc(size) \ @@ -39,6 +37,6 @@ void *__memdebug_malloc(size_t size, const char *func, const char *file, const unsigned int line); void __memdebug_free(void *ptr, const char *func, const char *file, const unsigned int line); -void memdebug_report(void); +void memdebug_report(int report_all); #endif /* _MEMDEBUG_H_ */ -- cgit v1.2.3-54-g00ecf From d76cfad42a29b94c129c8e48b145e61ebd03b183 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 9 Mar 2010 12:19:59 +0100 Subject: Add unittest module --- unittest/runtests.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ unittest/stringify.h | 1 + unittest/unittest.h | 40 +++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100755 unittest/runtests.py create mode 120000 unittest/stringify.h create mode 100644 unittest/unittest.h diff --git a/unittest/runtests.py b/unittest/runtests.py new file mode 100755 index 0000000..dbc616f --- /dev/null +++ b/unittest/runtests.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import os, sys +import getopt +import subprocess + +class colors: + RED = '\033[91m' + GREEN = '\033[92m' + END = '\033[0m' + + def disable(self): + self.RED = '' + self.GREEN = '' + self.END = '' + + def red(self, str): + return self.RED + str + self.END + + def green(self, str): + return self.GREEN + str + self.END + +failed = passed = 0 +c = colors() + +def fail(t, ret): + global failed, c + print(" %s %s (%s)" % (c.red("[FAIL]"), t, ret)) + failed += 1 + +def ok(t): + global passed, c + print(" %s %s" % (c.green("[PASS]"), t)) + passed += 1 + +def main(): + if len(sys.argv) < 2: + sys.exit(0) + + total = len(sys.argv[1:]) + + for t in sys.argv[1:]: + t_p = os.path.join('.', t) + if not os.path.exists(t_p): + fail(t, "not found") + continue + + ret = subprocess.call(t_p) + if ret == 0: + ok(t) + else: + fail(t, "retval %s" % ret) + + print("Ran %s tests (%s, %s)" % (total, c.green(str(passed) + " passed"), c.red(str(failed) + " failed"))) + exit(ret) + +if __name__ == '__main__': + main() diff --git a/unittest/stringify.h b/unittest/stringify.h new file mode 120000 index 0000000..2728caf --- /dev/null +++ b/unittest/stringify.h @@ -0,0 +1 @@ +../stringify/stringify.h \ No newline at end of file diff --git a/unittest/unittest.h b/unittest/unittest.h new file mode 100644 index 0000000..0ed005f --- /dev/null +++ b/unittest/unittest.h @@ -0,0 +1,40 @@ +#ifndef _UNITTEST_H_ +#define _UNITTEST_H_ + +#include +#include +#include "stringify.h" + +#define TEST_PASS 0 +#define TEST_FAIL 1 + +#define assert_err(fmt, args...) \ + fprintf(stderr, "%s:%d: Assertion error: " fmt, __FILE__, __LINE__, ##args) + +/* Assert the expression 'expr' */ +#define test_assert(expr) ({if (!(expr)) { \ + assert_err(__stringify(expr) "\n"); \ + exit(TEST_FAIL); \ + }}) + +/* Assert the expression 'expr' and print 'msg' on fail */ +#define test_assert_msg(expr, msg) ({if (!(expr)) { \ + assert_err(msg "\n"); \ + exit(TEST_FAIL); \ + }}) + +/* Assert that a == b */ +#define test_assert_eq(a, b) ({ \ + if ((a) != (b)) { \ + assert_err(__stringify(a) " != " __stringify(b) "\n"); \ + exit(TEST_FAIL); \ + }}) + +/* Assert that a != b */ +#define test_assert_neq(a, b) ({ \ + if ((a) == (b)) { \ + assert_err(__stringify(a) " != " __stringify(b) "\n"); \ + exit(TEST_FAIL); \ + }}) + +#endif /* _UNITTEST_H_ */ -- cgit v1.2.3-54-g00ecf From 098c2b10024f57666e381889438e5250ef882a44 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 28 Oct 2010 09:27:36 +0200 Subject: unittest: Add test_print and some more assert functions, correct message --- unittest/unittest.h | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/unittest/unittest.h b/unittest/unittest.h index 0ed005f..2350f55 100644 --- a/unittest/unittest.h +++ b/unittest/unittest.h @@ -3,13 +3,18 @@ #include #include +#include + #include "stringify.h" #define TEST_PASS 0 #define TEST_FAIL 1 +#define test_print(fmt, args...) \ + fprintf(stderr, "%s:%d:" fmt, __FILE__, __LINE__, ##args) + #define assert_err(fmt, args...) \ - fprintf(stderr, "%s:%d: Assertion error: " fmt, __FILE__, __LINE__, ##args) + test_print("Assertion error: " fmt, ##args) /* Assert the expression 'expr' */ #define test_assert(expr) ({if (!(expr)) { \ @@ -33,7 +38,34 @@ /* Assert that a != b */ #define test_assert_neq(a, b) ({ \ if ((a) == (b)) { \ - assert_err(__stringify(a) " != " __stringify(b) "\n"); \ + assert_err(__stringify(a) " == " __stringify(b) "\n"); \ + exit(TEST_FAIL); \ + }}) + +/* Assert that a is NULL */ +#define test_assert_null(a) ({ \ + if ((a) != NULL) { \ + assert_err(__stringify(a) " not NULL\n"); \ + exit(TEST_FAIL); \ + }}) + +/* Assert that a is not NULL */ +#define test_assert_not_null(a) ({ \ + if ((a) == NULL) { \ + assert_err(__stringify(a) " is NULL\n"); \ + exit(TEST_FAIL); \ + }}) + +static inline int __xstrmatch(const char *ctx, const char *arg) +{ + size_t len = strlen(ctx); + return (strlen(arg) == len && strncmp(arg, ctx, len) == 0); +} + +/* Assert that string a matches string b */ +#define test_assert_str_eq(a, b) ({ \ + if (!__xstrmatch((a), (b))) { \ + assert_err(__stringify(a) " does not match " __stringify(b) "\n"); \ exit(TEST_FAIL); \ }}) -- cgit v1.2.3-54-g00ecf