Update libtest.

[m6w6/libmemcached] / libtest / test.hpp

diff --git a/libtest/test.hpp b/libtest/test.hpp
index cf0e223d69cdecbcceee90dc5cb34609a25cd2d0..53db247a7ebc8d8c46d2a64ee18a9dc1afe3c701 100644 (file)
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -1,10 +1,37 @@
-/* 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:
+ *
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 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.
  */
 
 /*
@@ -13,40 +40,37 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <stdint.h>
 #include <arpa/inet.h>
 
 #include <libtest/visibility.h>
+#include <libtest/version.h>
 
+#include <libtest/vchar.hpp>
+#include <libtest/fatal.hpp>
+
+#include <libtest/has.hpp>
 #include <libtest/error.h>
+#include <libtest/strerror.h>
+#include <libtest/timer.hpp>
+#include <libtest/stream.h>
+#include <libtest/comparison.hpp>
+#include <libtest/server.h>
+#include <libtest/server_container.h>
+#include <libtest/wait.h>
 #include <libtest/callbacks.h>
 #include <libtest/test.h>
-#include <libtest/strerror.h>
+#include <libtest/dream.h>
 #include <libtest/core.h>
 #include <libtest/runner.h>
-#include <libtest/stats.h>
+#include <libtest/port.h>
+#include <libtest/is_local.hpp>
+#include <libtest/socket.hpp>
 #include <libtest/collection.h>
 #include <libtest/framework.h>
 #include <libtest/get.h>
-
-#pragma once
-
-LIBTEST_API
-  in_port_t default_port();
-
-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
-#define test_literal_param(X) (X), ((size_t)((sizeof(X) - 1)))
-#endif
-
-#define test_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+#include <libtest/cmdline.h>
+#include <libtest/string.hpp>
+#include <libtest/binaries.h>
+#include <libtest/http.hpp>
+#include <libtest/cpu.hpp>
+#include <libtest/tmpfile.hpp>