Fix common test usage, and merge in additional document changes.

diff --git a/docs/conf.py.in b/docs/conf.py.in
index 44f3f4200d85186e2e134028999fbc99707c9912..c27cd5c219bb20ba5512f6589fb812a8ca895b3b 100644 (file)
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -239,7 +239,6 @@ man_pages = [
   ('libmemcached_configuration', 'memcached', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('libmemcached_examples', 'libmemcached_examples', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('libmemcachedutil', 'libmemcachedutil', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memaslap', 'memaslap', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('memcached_analyze', 'memcached_analyze', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_append', 'memcached_append', u'Appending to or Prepending to data on the server', [u'Brian Aker'], 3),
   ('memcached_append', 'memcached_append_by_key', u'Appending to or Prepending to data on the server', [u'Brian Aker'], 3),
@@ -345,6 +344,7 @@ man_pages = [
   ('bin/memerror', 'memerror', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memflush', 'memflush', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memrm', 'memrm', u'libmemcached Documentation', [u'Brian Aker'], 1),
+  ('bin/memaslap', 'memaslap', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memslap', 'memslap', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memstat', 'memstat', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ]

diff --git a/docs/include.am b/docs/include.am
index 022b218bf8315ccb334870c5c351c8175f4390c9..d8c036d73f3d181bcc6163a695d0345afa6773d4 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -144,38 +144,38 @@ sphinx-help:
        @echo "  linkcheck  to check all external links for integrity"
        @echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
-html-local:
+html-local: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/html
        @echo
        @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/html."
 
-dirhtml:
+dirhtml: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/dirhtml
        @echo
        @echo "Build finished. The HTML pages are in $(SPHINX_BUILDDIR)/dirhtml."
 
-singlehtml:
+singlehtml: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/singlehtml
        @echo
        @echo "Build finished. The HTML page is in $(SPHINX_BUILDDIR)/singlehtml."
 
-pickle:
+pickle: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/pickle
        @echo
        @echo "Build finished; now you can process the pickle files."
 
-json:
+json: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/json
        @echo
        @echo "Build finished; now you can process the JSON files."
 
-htmlhelp:
+htmlhelp: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/htmlhelp
        @echo
        @echo "Build finished; now you can run HTML Help Workshop with the" \
              ".hhp project file in $(SPHINX_BUILDDIR)/htmlhelp."
 
-qthelp:
+qthelp: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/qthelp
        @echo
        @echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -184,7 +184,7 @@ qthelp:
        @echo "To view the help file:"
        @echo "# assistant -collectionFile $(SPHINX_BUILDDIR)/qthelp/Libmemcached.qhc"
 
-devhelp:
+devhelp: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/devhelp
        @echo
        @echo "Build finished."
@@ -193,40 +193,40 @@ devhelp:
        @echo "# ln -s $(SPHINX_BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Libmemcached"
        @echo "# devhelp"
 
-epub:
+epub: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/epub
        @echo
        @echo "Build finished. The epub file is in $(SPHINX_BUILDDIR)/epub."
 
-latex:
+latex: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/latex
        @echo
        @echo "Build finished; the LaTeX files are in $(SPHINX_BUILDDIR)/latex."
        @echo "Run \`make' in that directory to run these through (pdf)latex" \
              "(use \`make latexpdf' here to do that automatically)."
 
-latexpdf: latex
+latexpdf: latex changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/latex
        @echo "Running LaTeX files through pdflatex..."
        make -C $(SPHINX_BUILDDIR)/latex all-pdf
        @echo "pdflatex finished; the PDF files are in $(SPHINX_BUILDDIR)/latex."
 
-text:
+text: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/text
        @echo
        @echo "Build finished. The text files are in $(SPHINX_BUILDDIR)/text."
 
-man:
+man: docs/conf.py changes
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/man
        @echo
        @echo "Build finished. The manual pages are in $(SPHINX_BUILDDIR)/man."
 
-changes:
+changes: docs/conf.py linkcheck
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/changes
        @echo
        @echo "The overview file is in $(SPHINX_BUILDDIR)/changes."
 
-linkcheck:
+linkcheck: docs/conf.py
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/linkcheck
        @echo
        @echo "Link check complete; look for any errors in the above output " \

diff --git a/tests/atomsmasher.cc b/tests/atomsmasher.cc
index a525b95e3dd8cc0eabbd36735f97faaf31c74554..af692c6b43a67ffa387f7f298db25b0d825616db 100644 (file)
--- a/tests/atomsmasher.cc
+++ b/tests/atomsmasher.cc
@@ -12,7 +12,7 @@
 /*
   Sample test application.
 */
-#include "config.h"
+#include <libtest/common.h>
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/watchpoint.h>
@@ -30,7 +30,6 @@
 #include <clients/execute.h>
 
 #include <libtest/server.h>
-#include <libtest/test.hpp>
 
 /* Number of items generated for tests */
 #define GLOBAL_COUNT 100000

diff --git a/tests/basic.cc b/tests/basic.cc
index 8f57e4c5ec7776bd6ffed3904ad4d3d3f5790840..666fa4d6ca0735fdea94d068c29b2abb88bf9241 100644 (file)
--- a/tests/basic.cc
+++ b/tests/basic.cc
@@ -35,11 +35,11 @@
  *
  */
 
+#include <libtest/common.h>
+
 #include <libmemcached/memcached.h>
 #include <libmemcached/is.h>
 
-#include <libtest/test.hpp>
-
 #include "tests/basic.h"
 
 #include <cstring>

diff --git a/tests/cpp_example.cc b/tests/cpp_example.cc
index fd0b00f47d74d6588bcdefaa6dd25b43b28da1ae..f84af7596e25759e9e55847508208793cb1cba37 100644 (file)
--- a/tests/cpp_example.cc
+++ b/tests/cpp_example.cc
@@ -1,6 +1,7 @@
 /*
  * An example file showing the usage of the C++ libmemcached interface.
  */
+#include <config.h>
 
 #include <vector>
 #include <string>

diff --git a/tests/deprecated.cc b/tests/deprecated.cc
index eebc7d06e5fe1f0478d97b5036caff281ba18066..bf0e0c6dbe6ebe75379549c327285c59aa2dc47e 100644 (file)
--- a/tests/deprecated.cc
+++ b/tests/deprecated.cc
@@ -35,11 +35,10 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
 #include <cassert>
 
-#include <libtest/test.hpp>
 #include <libmemcached/memcached.h>
 #include <tests/deprecated.h>
 

diff --git a/tests/error_conditions.cc b/tests/error_conditions.cc
index 09a01eb47a98b4acfa40c92bd14bc0f09fbb7598..ad4e2c8372055842d1116a1990711155814013bc 100644 (file)
--- a/tests/error_conditions.cc
+++ b/tests/error_conditions.cc
@@ -35,15 +35,13 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
 #define BUILDING_LIBMEMCACHED
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/is.h>
 
-#include <libtest/test.hpp>
-
 #include <tests/error_conditions.h>
 
 test_return_t memcached_increment_MEMCACHED_NO_SERVERS(memcached_st *)

diff --git a/tests/hash_plus.cc b/tests/hash_plus.cc
index e3130786f2606aa9844b8b0ec0fc9ff61df078f1..aa38a8654733d082eb80ae27999e74f073bbd528 100644 (file)
--- a/tests/hash_plus.cc
+++ b/tests/hash_plus.cc
@@ -2,9 +2,7 @@
   C++ to libhashkit
 */
 
-#include <config.h>
-
-#include <libtest/test.hpp>
+#include <libtest/common.h>
 
 #include <cstdio>
 #include <cstdlib>

diff --git a/tests/hashkit_functions.cc b/tests/hashkit_functions.cc
index 98396df5fa79dc4359fea411bb409b1c4d358589..42abcb620ff24541e1790ffdc42967f4198dca80 100644 (file)
--- a/tests/hashkit_functions.cc
+++ b/tests/hashkit_functions.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include "config.h"
+#include <libtest/common.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -44,8 +44,6 @@
 
 #include <libhashkit/hashkit.h>
 
-#include <libtest/test.hpp>
-
 #include "hash_results.h"
 
 static hashkit_st global_hashk;

diff --git a/tests/mem_functions.cc b/tests/mem_functions.cc
index c1bb70fec58505773a7b3360e9cc9cce5f414cb7..ba496f324045ffbddb37e5693f792677e78683fd 100644 (file)
--- a/tests/mem_functions.cc
+++ b/tests/mem_functions.cc
@@ -35,6 +35,7 @@
  *
  */
 
+#include <libtest/common.h>
 
 /*
   Test cases
@@ -44,8 +45,6 @@
 // !NEVER use common.h, always use memcached.h in your own apps
 #include <libmemcached/common.h>
 
-#include <stdint.h>
-
 #include <cassert>
 #include <memory>
 #include <signal.h>

diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc
index 8153e8ef074f3c167adcf1ce9497fcfc3cdebc10..2a82482f9feaca230428cf84b52c2d01a9c4ae5a 100644 (file)
--- a/tests/mem_udp.cc
+++ b/tests/mem_udp.cc
@@ -10,9 +10,9 @@
   Sample test application.
 */
 
-#include "config.h"
+#include <libtest/common.h>
 
-#include "libmemcached/common.h"
+#include <libmemcached/common.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -27,7 +27,6 @@
 #include <time.h>
 
 #include <libtest/server.h>
-#include <libtest/test.hpp>
 
 #define SERVERS_TO_CREATE 5
 

diff --git a/tests/parser.cc b/tests/parser.cc
index ad6020486b331cb54b0c81c9d0a5d6eaf2eb9b25..31bcf9b0174073a36afb58f8a614136788ad9514 100644 (file)
--- a/tests/parser.cc
+++ b/tests/parser.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
 #include <vector>
 #include <iostream>
@@ -43,8 +43,6 @@
 #include <cerrno>
 #include <cassert>
 
-#include <libtest/test.hpp>
-
 #define BUILDING_LIBMEMCACHED
 // !NEVER use common.h, always use memcached.h in your own apps
 #include <libmemcached/common.h>

diff --git a/tests/pool.cc b/tests/pool.cc
index 9e1d94f745d2c5f786b1ce848c97a71db248304f..8f2a1587a69fc1dce1fffb90cd79f8acc704d877 100644 (file)
--- a/tests/pool.cc
+++ b/tests/pool.cc
@@ -35,9 +35,7 @@
  *
  */
 
-#include <config.h>
-
-#include <libtest/test.hpp>
+#include <libtest/common.h>
 
 #include <vector>
 #include <iostream>

diff --git a/tests/print.cc b/tests/print.cc
index b3c8d066dc3648645296c6afedf955a10eba7510..f4e597f3898b09aeb1a131c72b6401d5fb09ee59 100644 (file)
--- a/tests/print.cc
+++ b/tests/print.cc
@@ -35,12 +35,11 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
 #include <iostream>
 
 #include <libmemcached/memcached.h>
-#include <libtest/test.hpp>
 
 #include "tests/print.h"
 

diff --git a/tests/replication.cc b/tests/replication.cc
index 3e4476c5e026bc2d7218a197747fae3a1ad8f0ca..330f7bf753c2fb4049ad0b4f87d70714bec5c4a8 100644 (file)
--- a/tests/replication.cc
+++ b/tests/replication.cc
@@ -35,10 +35,9 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
-#include <libtest/test.hpp>
-#include "libmemcached/common.h"
+#include <libmemcached/common.h>
 #include <tests/replication.h>
 
 test_return_t replication_set_test(memcached_st *memc)

diff --git a/tests/start.cc b/tests/start.cc
index 1f5d43e285a42da124d947a9e2d815ec3566b823..6ea0e47d6f9625f46f4a62b145a0f49083bcd64a 100644 (file)
--- a/tests/start.cc
+++ b/tests/start.cc
@@ -9,7 +9,7 @@
  *
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/tests/string.cc b/tests/string.cc
index 4048d91c31e1d84020bcd6b87f6e87ae9755304f..ea7ba59243653a3990fc915d27ea29328c7a9d16 100644 (file)
--- a/tests/string.cc
+++ b/tests/string.cc
@@ -35,6 +35,9 @@
  *
  */
 
+// We let libmemcached/common.h define config since we are looking at
+// library internals.
+
 #define BUILDING_LIBMEMCACHED
 
 #include <libmemcached/common.h>

diff --git a/tests/virtual_buckets.cc b/tests/virtual_buckets.cc
index 1714600ef21517c279b25d9a80af837bcf5aa2fb..9ae7d6f1c21d96d52bdf6a51e294ecf5323f8bc1 100644 (file)
--- a/tests/virtual_buckets.cc
+++ b/tests/virtual_buckets.cc
@@ -35,9 +35,8 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
-#include <libtest/test.hpp>
 #include <tests/virtual_buckets.h>
 
 #include <libmemcached/memcached.h>