diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-12-12 10:01:49 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-12-12 10:01:49 +0100 |
| commit | cec28c5ee04886ff30d4f3960d713e044837ff4f (patch) | |
| tree | 9177641c2bf9a9c1da4345ce10f3808ba790bb12 /src | |
| parent | 38f0ff98cf6da1e882b6b44fc3ed7b3d310fb91f (diff) | |
| parent | a1b6e5a034bc698b02d3c93e1707cab5622eaea6 (diff) | |
merge the 2 modifications
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/doc/installation.h | 2 | ||||
| -rw-r--r-- | src/python/doc/installation.rst | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/common/doc/installation.h b/src/common/doc/installation.h index c4ca10d1..d70a2efa 100644 --- a/src/common/doc/installation.h +++ b/src/common/doc/installation.h @@ -34,7 +34,7 @@ make \endverbatim * To test your build, run the following command in a terminal: * \verbatim make test \endverbatim * `make test` is using <a href="https://cmake.org/cmake/help/latest/manual/ctest.1.html">Ctest<\a> (CMake test driver - * program). If some of the tests are failing, plend send us the result of the following command: + * program). If some of the tests are failing, please send us the result of the following command: * \verbatim ctest --output-on-failure \endverbatim * * \subsection documentationgeneration Documentation 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 |