X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.hpp;h=e60895fa464881c420c547222980d55fc5143c0c;hb=f9bdaf620aab27a23bd4bb7b19d2597c3eef2c9c;hp=5953f82c3d36a8e4701eb8225a17290effcd8757;hpb=ecc7382f48857cb22e74ffa9496f9a31e956bde3;p=awesomized%2Flibmemcached

diff --git a/libtest/test.hpp b/libtest/test.hpp
index 5953f82c..e60895fa 100644
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -1,12 +1,40 @@
-/* uTest
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
- * Copyright (C) 2006-2009 Brian Aker
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  libtest
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
  */
 
+
 /*
   Structures for generic tests.
 */
@@ -19,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>
@@ -28,6 +58,8 @@
 #include <libtest/collection.h>
 #include <libtest/framework.h>
 #include <libtest/get.h>
+#include <libtest/stream.h>
+#include <libtest/cmdline.h>
 
 #pragma once
 
@@ -37,6 +69,12 @@ LIBTEST_API
 LIBTEST_API
   void set_default_port(in_port_t port);
 
+LIBTEST_API
+  const char* default_socket();
+
+LIBTEST_API
+  void set_default_socket(const char *socket);
+
 #ifdef __cplusplus
 #define test_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
 #else
@@ -44,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)