update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / civetweb / test / civetweb_check.h

diff --git a/ceph/src/civetweb/test/civetweb_check.h b/ceph/src/civetweb/test/civetweb_check.h
index 62abea176b9cf55cf5e9ac9f62ae6bb93ac80684..4701f2252ab9182ab05a2d78af7051ea979ce391 100644 (file)
--- a/ceph/src/civetweb/test/civetweb_check.h
+++ b/ceph/src/civetweb/test/civetweb_check.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015 the Civetweb developers
+/* Copyright (c) 2015-2017 the Civetweb developers
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,20 @@
 // FIXME: check uses GCC specific variadic macros that are non-standard
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 #endif
+
+#if defined(__MINGW__) || defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+/* Disable warnings for defining _CRT_SECURE_NO_* (here) and
+ * _CHECK_CHECK_STDINT_H (in check.h)
+ */
+/* Disable until Warning returns to Travis CI or AppVeyor
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wno-variadic-macros"
+#pragma GCC diagnostic ignored "-Wreserved-id-macro"
+*/
+#endif
+
 #ifdef _MSC_VER
 #undef pid_t
 #define pid_t int
@@ -35,7 +49,18 @@
 #pragma warning(disable : 4127)
 #endif
 #include <stdint.h>
+
+/* All unit tests use the "check" framework.
+ * Download from https://libcheck.github.io/check/
+ */
 #include "check.h"
+
+#if (CHECK_MINOR_VERSION < 11)
+#ifndef LOCAL_TEST
+#error "CivetWeb unit tests require at least check 0.11.0"
+#endif
+#endif
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
@@ -47,7 +72,25 @@
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+#if defined(__MINGW__) || defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
+#ifdef __clang__
+/* When using -Weverything, clang does not accept it's own headers
+ * in a release build configuration. Disable what is too much in
+ * -Weverything. */
+#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
+#endif
+
 /* A minimal timeout used for all tests with the "check" framework. */
 #define civetweb_min_test_timeout (30)
 
+/* A minimal timeout for all tests starting a server. */
+#define civetweb_min_server_test_timeout (civetweb_min_test_timeout + 30)
+
+/* A default timeout for all tests running multiple requests to a server. */
+#define civetweb_mid_server_test_timeout                                       \
+       (civetweb_min_server_test_timeout + 180)
+
 #endif /* TEST_CIVETWEB_CHECK_H_ */