Merge in all of libtest updates.

[m6w6/libmemcached] / libtest / test.hpp

diff --git a/libtest/test.hpp b/libtest/test.hpp
index 71cd707f4f612f6cfe72b5418deb222d2f537fa0..e60895fa464881c420c547222980d55fc5143c0c 100644 (file)
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -1,9 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  uTest, libtest
+ *  libtest
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  Copyright (C) 2006-2009 Brian Aker
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -48,6 +47,8 @@
 #include <libtest/visibility.h>
 
 #include <libtest/error.h>
+#include <libtest/server.h>
+#include <libtest/wait.h>
 #include <libtest/callbacks.h>
 #include <libtest/test.h>
 #include <libtest/strerror.h>
@@ -58,6 +59,7 @@
 #include <libtest/framework.h>
 #include <libtest/get.h>
 #include <libtest/stream.h>
+#include <libtest/cmdline.h>
 
 #pragma once
 
@@ -80,3 +82,5 @@ LIBTEST_API
 #endif
 
 #define test_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+
+#define test_array_length(__array) sizeof(__array)/sizeof(&__array)