Index: propedit/Makefile =================================================================== --- propedit/Makefile (revision 37122) +++ propedit/Makefile (revision 37123) @@ -9,7 +9,7 @@ SRC=$(ROOT)/src SRC_3RD=$(ROOT)/src_3rd -CFLAGS = $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd -I$(LIBRND_INCDIR)/librnd/src_3rd +CFLAGS = -g $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd -I$(LIBRND_INCDIR)/librnd/src_3rd LDFLAGS = $(LDFLAGS_LIBRND) LDLIBS = -lrnd-core -lrnd-3rd $(LDFLAGS_LIBRND) -lm Index: propedit/tester.c =================================================================== --- propedit/tester.c (revision 37122) +++ propedit/tester.c (revision 37123) @@ -1,7 +1,12 @@ +#include #include -#include #include "props.h" +#define ASSERT(expr) \ +do { \ + if (!(expr)) { fprintf(stderr, "ASSERT(" #expr ") in %d\n", __LINE__); abort(); } \ +} while(0) + void *rnd_gui = NULL; int pcb_propsel_set(const char *prop, const char *value) @@ -87,40 +92,40 @@ /* --- add a few items properly - should work --- */ /* coord */ - v.coord = 42; assert(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); - v.coord = 10; assert(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); - v.coord = 42; assert(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); - v.coord = 42; assert(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); + v.coord = 42; ASSERT(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); + v.coord = 10; ASSERT(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); + v.coord = 42; ASSERT(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); + v.coord = 42; ASSERT(pcb_props_add(&ctx, "crd", PCB_PROPT_COORD, v) != NULL); /* int */ - v.i = 42; assert(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); - v.i = 10; assert(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); - v.i = 42; assert(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); - v.i = 42; assert(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); + v.i = 42; ASSERT(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); + v.i = 10; ASSERT(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); + v.i = 42; ASSERT(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); + v.i = 42; ASSERT(pcb_props_add(&ctx, "num", PCB_PROPT_INT, v) != NULL); /* angle */ - v.angle = 42.0; assert(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); - v.angle = 10.5; assert(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); - v.angle = 42.0; assert(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); - v.angle = 42.0; assert(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); + v.angle = 42.0; ASSERT(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); + v.angle = 10.5; ASSERT(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); + v.angle = 42.0; ASSERT(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); + v.angle = 42.0; ASSERT(pcb_props_add(&ctx, "ang", PCB_PROPT_ANGLE, v) != NULL); /* double */ - v.d = 42.0; assert(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); - v.d = 10.5; assert(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); - v.d = 42.0; assert(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); - v.d = 42.0; assert(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); + v.d = 42.0; ASSERT(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); + v.d = 10.5; ASSERT(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); + v.d = 42.0; ASSERT(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); + v.d = 42.0; ASSERT(pcb_props_add(&ctx, "dbl", PCB_PROPT_DOUBLE, v) != NULL); /* string */ - v.string = "foo"; assert(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); - v.string = "bar"; assert(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); - v.string = "BAZ"; assert(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); - v.string = "foo"; assert(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); - v.string = "foo"; assert(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); + v.string = "foo"; ASSERT(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); + v.string = "bar"; ASSERT(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); + v.string = "BAZ"; ASSERT(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); + v.string = "foo"; ASSERT(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); + v.string = "foo"; ASSERT(pcb_props_add(&ctx, "str", PCB_PROPT_STRING, v) != NULL); /* --- add a items with the wrong type - should fail --- */ - v.i = 42; assert(pcb_props_add(&ctx, "crd", PCB_PROPT_INT, v) == NULL); - v.i = 42; assert(pcb_props_add(&ctx, "crd", 1234, v) == NULL); - v.i = 42; assert(pcb_props_add(&ctx, "ang", 1234, v) == NULL); + v.i = 42; ASSERT(pcb_props_add(&ctx, "crd", PCB_PROPT_INT, v) == NULL); + v.i = 42; ASSERT(pcb_props_add(&ctx, "crd", 1234, v) == NULL); + v.i = 42; ASSERT(pcb_props_add(&ctx, "ang", 1234, v) == NULL); print_all(&ctx.props); @@ -127,15 +132,15 @@ /* --- get some stats --- */ /* these should work */ - assert(print_stat(&ctx, "crd", 1) != NULL); - assert(print_stat(&ctx, "num", 1) != NULL); - assert(print_stat(&ctx, "ang", 1) != NULL); - assert(print_stat(&ctx, "dbl", 1) != NULL); - assert(print_stat(&ctx, "str", 0) != NULL); + ASSERT(print_stat(&ctx, "crd", 1) != NULL); + ASSERT(print_stat(&ctx, "num", 1) != NULL); + ASSERT(print_stat(&ctx, "ang", 1) != NULL); + ASSERT(print_stat(&ctx, "dbl", 1) != NULL); + ASSERT(print_stat(&ctx, "str", 0) != NULL); /* these should fail */ - assert(print_stat(&ctx, "str", 1) == NULL); - assert(print_stat(&ctx, "HAH", 1) == NULL); + ASSERT(print_stat(&ctx, "str", 1) == NULL); + ASSERT(print_stat(&ctx, "HAH", 1) == NULL); return 0; }