Merge in util library.

[m6w6/libmemcached] / libtest / test.hpp

diff --git a/libtest/test.hpp b/libtest/test.hpp
index e60895fa464881c420c547222980d55fc5143c0c..eed030cb9d764b8c9c89a426a8854ffa0a0d0672 100644 (file)
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -60,27 +60,21 @@
 #include <libtest/get.h>
 #include <libtest/stream.h>
 #include <libtest/cmdline.h>
+#include <libtest/string.hpp>
 
 #pragma once
 
 LIBTEST_API
-  in_port_t default_port();
+in_port_t default_port();
 
 LIBTEST_API
-  void set_default_port(in_port_t port);
+void set_default_port(in_port_t port);
 
 LIBTEST_API
-  const char* default_socket();
+const char* default_socket();
 
 LIBTEST_API
-  void set_default_socket(const char *socket);
+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)
-
-#define test_array_length(__array) sizeof(__array)/sizeof(&__array)
+LIBTEST_API
+bool test_is_local(void);