Checked the tests using valgrind and eliminated misused calls.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/makefile.linux b/makefile.linux
index 228568ff9f6401fcf4ae0806343e3159ab106309..ae02e3c7c98047d1cb06a7c5b94835ea7de24da5 100644 (file)
--- a/makefile.linux
+++ b/makefile.linux
@@ -1,7 +1,9 @@
+# -*- Makefile -*-
+
 CC=gcc
 LD=gcc
 CFLAGS  =-g -Wall `sdl-config --cflags`
-CFLAGS +=-O9 -funroll-loops -fomit-frame-pointer
+#CFLAGS +=-O9 -funroll-loops -fomit-frame-pointer
 LDFLAGS=`sdl-config --libs` -lSDL_mixer
 
 C_FILES=src/dlb.c src/linked.c src/sprite.c src/ag.c
@@ -29,5 +31,17 @@ src/sprite.o: src/sprite.c
 src/ag.o: src/ag.c
        $(CC) $(CFLAGS) -c -o $@ $^
 
+src/ag_test.o: src/ag_test.c
+       $(CC) $(CFLAGS) -DUNIT_TEST -c -o $@ $^
+
+tests: test_ag test_linked
+
+test_ag: ag $(TEST_OBJS) src/unittest.h
+       $(LD) $(LDFLAGS) -o $@ $(TEST_OBJS)
+
+test_linked: src/linked.c src/unittest.h
+       $(CC) $(CFLAGS) -Isrc -DUNIT_TEST $< -o $@
+
 clean:
        rm -f src/*.o
+       rm -f test_linked test_ag

diff --git a/src/ag_test.c b/src/ag_test.c
index 6bea8a4fd8b97ccb3104be9b3b7afba43a51f776..7ef3464e2021a195e96ea1365807f04f7cc2409e 100644 (file)
--- a/src/ag_test.c
+++ b/src/ag_test.c
@@ -1,5 +1,8 @@
+#ifndef UNIT_TEST
 #define UNIT_TEST
+#endif
 #include "unittest.h"
+
 #define main ag_main
 #include "ag.c"
 #undef main
@@ -17,8 +20,12 @@ static int test_nextBlank()
 static int test_shiftLeftKill()
 {
     char a[7] = { 'a','b','c','d','e','f', 0 };
-    test_equals_str("shiftLeftKill", "bcdef", shiftLeftKill(a));
-    test_equals_str("shiftLeftKill const str", "bcdef", shiftLeftKill("abcdef"));
+    char *s = shiftLeftKill(a);
+    test_equals_str("shiftLeftKill", "bcdef", s);
+    free(s);
+    s = shiftLeftKill("abcdef");
+    test_equals_str("shiftLeftKill const str", "bcdef", s);
+    free(s);
     return 0;
 }
 
@@ -31,26 +38,6 @@ static int test_shiftLeft()
     return 0;
 }
 
-static int test_swapChars()
-{
-    char a[7] = { 'a','b','c','d','e','f', 0 };
-    const char *p = a, *q = NULL;
-    test_equals_str("swapChars end", "fbcdea", swapChars(0, 5, a));
-    q = swapChars(2, 3, a);
-    test_equals_str("swapChars inner", "fbdcea", q);
-    test_equals_ptr("swapChars ptr equiv", p, q);
-    return 0;
-}
-
-static int test_revFirstNonSpace()
-{
-    char a[7] = { 'a','b','c','d','e','f', 0 };
-    char b[7] = { 'a','b',SPACE_CHAR,'d','e',SPACE_CHAR, 0 };
-    test_equals_int("rev no space", 6, revFirstNonSpace(a));
-    test_equals_int("rev find space", 5, revFirstNonSpace(b));
-    return 0;
-}
- 
 static int test_whereinstr()
 {
     test_equals_int("where is b", 1, whereinstr("abcdef",'b'));
@@ -63,18 +50,12 @@ struct unit_test_t unit_tests[] = {
     {NULL, test_shiftLeftKill, NULL},
     {NULL, test_shiftLeft, NULL},
     {NULL, test_nextBlank, NULL},
-    {NULL, test_swapChars, NULL},
-    {NULL, test_revFirstNonSpace, NULL},
     {NULL, test_whereinstr, NULL},
 };
 
 int
 main(void)
 {
-    size_t n;
-    for (n = 0; n < sizeof(unit_tests)/sizeof(unit_tests[0]); ++n) {
-        run_tests(&unit_tests[n]);
-    }
-    test_print_results();
+    run_tests(unit_tests);
     return 0;
 }