summaryrefslogtreecommitdiff
path: root/src/python/doc/installation.rst
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2019-12-12 10:01:49 +0100
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2019-12-12 10:01:49 +0100
commitcec28c5ee04886ff30d4f3960d713e044837ff4f (patch)
tree9177641c2bf9a9c1da4345ce10f3808ba790bb12 /src/python/doc/installation.rst
parent38f0ff98cf6da1e882b6b44fc3ed7b3d310fb91f (diff)
parenta1b6e5a034bc698b02d3c93e1707cab5622eaea6 (diff)
merge the 2 modifications
Diffstat (limited to 'src/python/doc/installation.rst')
-rw-r--r--src/python/doc/installation.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/python/doc/installation.rst b/src/python/doc/installation.rst
index 50a697c7..14000ecf 100644
--- a/src/python/doc/installation.rst
+++ b/src/python/doc/installation.rst
@@ -99,9 +99,16 @@ following `Ctest <https://cmake.org/cmake/help/latest/manual/ctest.1.html>`_
export PYTHONPATH='$PYTHONPATH:/path-to-gudhi/build/python'
ctest
+<<<<<<< HEAD
.. note::
One can use :code:`ctest` specific options in the python directory:
+=======
+`make test` is using
+`Ctest <https://cmake.org/cmake/help/latest/manual/ctest.1.html>`_ (CMake test
+driver program). If some of the tests are failing, please send us the result of
+the following command:
+>>>>>>> a1b6e5a034bc698b02d3c93e1707cab5622eaea6
.. code-block:: bash