ex32 plus runtests improvements

lcthw-remnants-2/liblcthw/tests/lcthw/list_tests.c

@@ -0,0 +1,112 @@
+#include "../minunit.h"
+#include <lcthw/list.h>
+#include <assert.h>
+
+static List *list = NULL;
+char *test1 = "test1 data";
+char *test2 = "test2 data";
+char *test3 = "test3 data";
+
+
+char *test_create()
+{
+  list = List_create();
+  mu_assert(list != NULL, "Failed to create list.");
+
+  return NULL;
+}
+
+
+char *test_destroy()
+{
+  List_clear_destroy(list);
+
+  return NULL;
+}
+
+
+char *test_push_pop()
+{
+  List_push(list, test1);
+  mu_assert(List_last(list) == test1, "Wrong last value.");
+
+  List_push(list, test2);
+  mu_assert(List_last(list) == test2, "Wrong last value");
+
+  List_push(list, test3);
+  mu_assert(List_last(list) == test3, "Wrong last value");
+  mu_assert(List_count(list) == 3, "Wrong count on push.");
+
+  char *val = List_pop(list);
+  mu_assert(val == test3, "Wrong value on pop.");
+
+  val = List_pop(list);
+  mu_assert(val == test2, "Wrong value on pop.");
+
+  val = List_pop(list);
+  mu_assert(val == test1, "Wrong value on pop.");
+  mu_assert(List_count(list) == 0, "Wrong count after pop.");
+
+  return NULL;
+}
+
+char *test_unshift()
+{
+  List_unshift(list, test1);
+  mu_assert(List_first(list) == test1, "Wrong first value.");
+
+  List_unshift(list, test2);
+  mu_assert(List_first(list) == test2, "Wrong first value.");
+
+  List_unshift(list, test3);
+  mu_assert(List_first(list) == test3, "Wrong first value.");
+  mu_assert(List_count(list) == 3, "Wrong count on unshift.");
+
+  return NULL;
+}
+
+char *test_remove()
+{
+  // we only need to test the middle remove case since push/shift
+  // already tests the other cases
+
+  char *val = List_remove(list, list->first->next);
+  mu_assert(val == test2, "Wrong removed element.");
+  mu_assert(List_count(list) == 2, "Wrong count after remove.");
+  mu_assert(List_first(list) == test3, "Wrong first after remove.");
+  mu_assert(List_last(list) == test1, "Wrong last after remove.");
+
+  return NULL;
+}
+
+
+char *test_shift()
+{
+  mu_assert(List_count(list) != 0, "Wrong count before shift.");
+
+  char *val = List_shift(list);
+  mu_assert(val == test3, "Wrong value on shift.");
+
+  val = List_shift(list);
+  mu_assert(val == test1, "Wrong value on shift.");
+  mu_assert(List_count(list) == 0, "Wrong count after shift.");
+
+  return NULL;
+}
+
+
+
+char *all_tests() {
+  mu_suite_start();
+
+  mu_run_test(test_create);
+  mu_run_test(test_push_pop);
+  mu_run_test(test_unshift);
+  mu_run_test(test_remove);
+  mu_run_test(test_shift);
+  mu_run_test(test_destroy);
+
+  return NULL;
+}
+
+RUN_TESTS(all_tests);

lcthw-remnants-2/liblcthw/tests/minunit.h

@@ -13,7 +13,8 @@
   message = test(); tests_run++; if (message) return message;
 
 #define RUN_TESTS(name) int main(int argc, char *argv[]) {\
-  argc = 1; \
+  argc = argc; \
+  argv = argv; \
   debug("----- RUNNING: %s", argv[0]);\
   printf("----\nRUNNING: %s\n", argv[0]);\
   char *result = name();\

lcthw-remnants-2/liblcthw/tests/runtests.c

@@ -4,7 +4,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <fnmatch.h>
-#include <dbg.h>
+#include <lcthw/dbg.h>
 
 int test_selector(const struct dirent *ep)
 {
@@ -20,17 +20,25 @@ int run_tests_file(char *filename)
   return -1;
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
   int entcount = 0;
   int rc = 0;
   int i = 0;
   int ntests = 0;
-  char *testsdir = getenv("TESTS");
+  char *testsdir = NULL;
   char *valgrind = getenv("VALGRIND");
   struct dirent **namelist = NULL;
   struct dirent *ep = NULL;
 
+  if(argc > 1) {
+    testsdir = argv[1];
+  }
+
+  if(!testsdir) {
+    testsdir = getenv("TESTS");
+  }
+
   if(!testsdir) {
     testsdir = "./tests";
   }
@@ -70,14 +78,19 @@ int main(void)
       continue;
     }
 
-    printf("ERROR in test %s: here's tests/tests.log\n", filename);
-    printf("------\n");
-    rc = system("tail tests/tests.log");
+    printf("ERROR in test %s", filename);
+    if(access("tests/tests.log", R_OK) == 0) {
+      printf(": here's tests/tests.log\n");
+      printf("------\n");
+      rc = system("tail tests/tests.log");
+    } else {
+      printf("\n");
+    }
     goto error;
   }
 
   printf("------\n");
-  printf("Total of %d test files run.\n", ntests);
+  printf("Total of %d test file%s run.\n", ntests, ntests > 1 ? "s" : "");
 
   if(namelist) {
     free(namelist);