X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.hpp;h=d904070008c8a64b3fe0586be8aa03490fa5d5d5;hb=8c2c677ebb626a4b7b8144bea5ea231fa75ba435;hp=864552fbb00904bd9a7d53dd937d8dbfdb8ffcb7;hpb=7b07a66da945a8463054f9514aa50d0085d6702b;p=awesomized%2Flibmemcached

diff --git a/libtest/test.hpp b/libtest/test.hpp
index 864552fb..d9040700 100644
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -38,30 +38,38 @@
   Structures for generic tests.
 */
 
-#include <cstdio>
-#include <cstdlib>
-
-#if defined(WIN32) || defined(__MINGW32__)
-# include <winsock2.h>
-# include <ws2tcpip.h>
-
-typedef short in_port_t;
+#pragma once
 
+#ifndef YATL_FULL
+# define YATL_FULL 1
 #endif
 
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
+#ifndef __PRETTY_FUNCTION__
+# define __PRETTY_FUNCTION__ __func__
 #endif
 
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
+#define YATL_STRINGIFY(x) #x
+#define YATL_TOSTRING(x) YATL_STRINGIFY(x)
+#define YATL_AT __FILE__ ":" YATL_TOSTRING(__LINE__)
+#define YATL_AT_PARAM __func__, AT
+#define YATL_UNIQUE __FILE__ ":" YATL_TOSTRING(__LINE__) "_unique"
+#define YATL_UNIQUE_FUNC_NAME __FILE__ ":" YATL_TOSTRING(__LINE__) "_unique_func"
+
+#define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
+
+#include <cstdio>
+#include <cstdlib>
+#include <arpa/inet.h>
 
 #include <libtest/visibility.h>
 #include <libtest/version.h>
 
 #include <libtest/vchar.hpp>
-#include <libtest/fatal.hpp>
+#include <libtest/error.h>
+#include <libtest/exception.hpp>
+#include <libtest/exception/disconnected.hpp>
+#include <libtest/exception/fatal.hpp>
+#include <libtest/result.hpp>
 
 #include <libtest/has.hpp>
 #include <libtest/error.h>
@@ -90,3 +98,5 @@ typedef short in_port_t;
 #include <libtest/http.hpp>
 #include <libtest/cpu.hpp>
 #include <libtest/tmpfile.hpp>
+#include <libtest/client.hpp>
+#include <libtest/thread.hpp>