Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469

[awesomized/libmemcached] / libtest / test.hpp

diff --git a/libtest/test.hpp b/libtest/test.hpp
index bdcccdc02b113fbee0e2e3fd036449a49ea700fd..d904070008c8a64b3fe0586be8aa03490fa5d5d5 100644 (file)
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -38,6 +38,25 @@
   Structures for generic tests.
 */
 
+#pragma once
+
+#ifndef YATL_FULL
+# define YATL_FULL 1
+#endif
+
+#ifndef __PRETTY_FUNCTION__
+# define __PRETTY_FUNCTION__ __func__
+#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>
@@ -46,7 +65,11 @@
 #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>
@@ -75,3 +98,5 @@
 #include <libtest/http.hpp>
 #include <libtest/cpu.hpp>
 #include <libtest/tmpfile.hpp>
+#include <libtest/client.hpp>
+#include <libtest/thread.hpp>