X-Git-Url: http://git.scottworley.com/tl-append/blobdiff_plain/71a7e5c5f2fa792715f1c4c9491ad8cc7e718388..d522116b5fdc09e3f83fe4f88515dec52a3e0462:/tl-append-test.c?ds=sidebyside

diff --git a/tl-append-test.c b/tl-append-test.c
index 2a5d233..6d037cb 100644
--- a/tl-append-test.c
+++ b/tl-append-test.c
@@ -3,32 +3,29 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+
+#include "common.h"
 
 typedef struct expectation {
+  time_t a, b;
   const char *message;
 } ex_t;
 
-const ex_t END = {NULL};
-static int is_end(ex_t exp) { return exp.message == END.message; }
-static ex_t expectation(const char *message) {
+const ex_t END = {((time_t)-1), ((time_t)-1), NULL};
+static int is_end(ex_t exp) {
+  return exp.a == END.a && exp.b == END.b && exp.message == END.message;
+}
+static ex_t expectation(time_t a, time_t b, const char *message) {
   ex_t exp;
+  exp.a = a;
+  exp.b = b;
   exp.message = message;
   return exp;
 }
 
-static void die(const char *message) {
-  fputs(message, stderr);
-  fputc('\n', stderr);
-  exit(1);
-}
-
-static void die_err(const char *message) {
-  perror(message);
-  exit(1);
-}
-
 static void remove_logfile() {
-  if (remove("tl.log") != 0) {
+  if (remove(FILENAME) != 0) {
     if (errno != ENOENT) {
       die_err("Error removing log file");
     }
@@ -39,19 +36,21 @@ static ex_t write_to_tl_append(const char *content) {
   FILE *p = popen("./tl-append", "w");
   if (p == NULL)
     die_err("Couldn't run tl-append");
+  time_t start = time(NULL);
   if (fputs(content, p) == EOF)
     die("Couldn't write to pipe");
   int status = pclose(p);
+  time_t end = time(NULL);
   if (status < 0)
     die_err("Error closing pipe");
   if (status != 0)
     die("tl-append exited abnormally");
-  return expectation(content);
+  return expectation(start, end, content);
 }
 
 static void verify_log_contents(ex_t exps[]) {
 
-  FILE *f = fopen("tl.log", "r");
+  FILE *f = fopen(FILENAME, "r");
   if (f == NULL)
     die_err("Error opening log file");
   for (size_t i = 0; !is_end(exps[i]); i++) {