Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / libtests / test.h

diff --git a/libtests/test.h b/libtests/test.h
index cada395ad03dcf55c8f0fcbc73d4775d928d7d7b..cfc4ebb573ae968a77032a4737ec6ae64bc80047 100644 (file)
--- a/libtests/test.h
+++ b/libtests/test.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2005, 2007, 2008, 2010 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/un.h>
-#include <pcre.h>
 #include <setjmp.h>
 
 #include "mem.h"
@@ -61,6 +60,7 @@
 #include "addr.h"
 #include "base64.h"
 #include "url.h"
+#include "regexp.h"
 #include "regsub.h"
 
 extern long long tests, errors;
@@ -95,7 +95,7 @@ extern int skipped;
   const char *got = GOT;                                                \
   const char *want = WANT;                                              \
                                                                         \
-  if(want == 0) {                                                       \
+  if(got == 0) {                                                       \
     fprintf(stderr, "%s:%d: %s returned 0\n",                           \
             __FILE__, __LINE__, #GOT);                                  \
     count_error();                                                      \