Update libtest.

[m6w6/libmemcached] / libtest / common.h

diff --git a/libtest/common.h b/libtest/common.h
index 9b00f6de459db2c824762dd068c30654a0c2443d..777d21c3cfd85fb0d2ecb136512c9b878aba911a 100644 (file)
--- a/libtest/common.h
+++ b/libtest/common.h
@@ -1,9 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/ All
- *  rights reserved.
+ *  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
@@ -34,17 +33,48 @@
  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-
 /*
-  Common include file for libmemached
+  Common include file for libtest
 */
 
 #pragma once
 
-#include <config.h>
-
-#include <inttypes.h>
+#include <cassert>
+#include <cerrno>
 #include <cstdlib>
+#include <sstream>
+#include <string>
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H 
+#include <sys/resource.h> 
+#endif
+ 
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#endif
 
 #include <libtest/test.hpp>
+
+#include <libtest/is_pid.hpp>
+
+#include <libtest/gearmand.h>
+#include <libtest/blobslap_worker.h>
+#include <libtest/memcached.h>
+#include <libtest/drizzled.h>
+
+#include <libtest/libtool.hpp>
+#include <libtest/killpid.h>
+#include <libtest/signal.h>
+