1 files changed, 64 insertions, 2 deletions

diff --git a/02-usart/test_harness/test_harness.c b/02-usart/test_harness/test_harness.c
index 3a6d10a..87606ee 100644
--- a/02-usart/test_harness/test_harness.c
+++ b/02-usart/test_harness/test_harness.c
@@ -26,7 +26,58 @@ test_t* iter = &__start_tests;
 
 static int execute_test(test_t* test);
 
-int main() {
+void test_printll(size_t sz, long long v1, long long v2)
+{
+  fprintf(stderr, "%lld == %lld\n", v1, v2);
+}
+void test_printul(size_t sz, unsigned long v1, unsigned long v2)
+{
+  fprintf(stderr, "%lu == %lu\n", v1, v2);
+}
+void test_printd(size_t sz, int v1, int v2)
+{
+  fprintf(stderr, "%d == %d\n", v1, v2);
+}
+void test_printl(size_t sz, long v1, long v2)
+{
+  fprintf(stderr, "%lu == %lu\n", v1, v2);
+}
+void test_printui(size_t sz, unsigned int v1, unsigned int v2)
+{
+  fprintf(stderr, "%u == %u\n", v1, v2);
+}
+void test_prints(size_t sz, short v1, short v2)
+{
+  fprintf(stderr, "%hu == %hu\n", v1, v2);
+}
+void test_printus(size_t sz, unsigned short v1, unsigned short v2)
+{
+  fprintf(stderr, "%hu == %hu\n", v1, v2);
+}
+void test_printc(size_t sz, char v1, char v2)
+{
+  fprintf(stderr, "'%c' == '%c'\n", v1, v2);
+}
+void test_printf(size_t sz, double v1, double v2)
+{
+  fprintf(stderr, "%f == %f\n", v1, v2);
+}
+void test_printp(size_t sz, void* v1, void* v2)
+{
+  fprintf(stderr, "%p == %p\n", v1, v2);
+}
+void test_printuc(
+    size_t sz, unsigned char v1, unsigned char v2)
+{
+  fprintf(stderr, "%02x == %02x\n", (int) v1, (int) v2);
+}
+
+int do_fork = 1;
+int main(int argc, char** argv) {
+  if (argc > 1 && strcmp(argv[1], "--nofork") == 0) {
+    do_fork = 0;
+  }
+
   for( ; iter < &__stop_tests; ++ iter) {
     if (iter->fn_ptr != NULL) {
       execute_test(iter);
@@ -44,12 +95,23 @@ static int execute_test(test_t* test)
 {
   char fullname[512];
   int status;
-  int ec;
+  int ec = 0;
   pid_t pid;
 
   snprintf(
       fullname, sizeof(fullname), "%s::%s", iter->test_suite, iter->test_name);
 
+  if (!do_fork) {
+    if ((ec = setjmp(jmpbuf)) == 0) {
+      test->fn_ptr();
+      printf("%s " GREEN "[PASS]" RESET "\n", fullname);
+      return 0;
+    } else {
+      printf("%s " RED "[FAIL] %d" RESET "\n", fullname, ec);
+      return ec;
+    }
+  }
+
   if (!(pid = fork())) {
     // child