Merge pull request #2034 from Exiv2/fix_README_ctest_main

Updating documentation on main to respect ctest
Exiv2 · Dec 20, 2021 · 41ae517 · 41ae517
2 parents 29cc981 + 10661d6
commit 41ae517
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 119 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,17 +110,21 @@ if( EXIV2_BUILD_SAMPLES )
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
             COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests
         )
-        add_test(NAME bugfixes
+        add_test(NAME bugfixTests
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
             COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes
         )
+        add_test(NAME lensTests
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
+            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
+        )
         add_test(NAME tiffTests
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
             COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test
         )
-        add_test(NAME lensTests
+        add_test(NAME versionTests
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
-            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
+            COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests/version_test.py 
         )
     endif()
 endif()

diff --git a/README-CONAN.md b/README-CONAN.md
@@ -98,21 +98,19 @@ os_build=Windows
 [env]
 ```
 
-_Profiles for Visual Studio are discussed in detail here: [Visual Studio Notes](#2-2)__
+_Profiles for Visual Studio are discussed in detail here: [Visual Studio Notes](#2-2)_
 
 <name id="1-4"></a>
 
 ##### 1.4) Build dependencies, create build environment, build and test</a>
 
 
-|         | Build Steps   | Linux and macOS                | Visual Studio |
-|:--      |:--------------|--------------------------------|------------------------------|
+|         | Build Steps                                                              | Linux and macOS       | Visual Studio |
+|:--      |:-------------------------------------------------------------------------|-----------------------|------------------------------|
 | _**1**_ | Get conan to fetch dependencies<br><br>The output can be quite<br>long as conan downloads and/or builds<br>zlib, expat, curl and other dependencies.| $ conan install ..<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--build missing       | c:\\..\\build> conan install .. --build missing<br>&nbsp;&nbsp;&nbsp;&nbsp;--profile msvc2019Release64 |
-| _**2**_ | Get cmake to generate<br>makefiles or sln/vcxproj | $ cmake ..  | c:\\..\\build> cmake&nbsp;..&nbsp;-G&nbsp;"Visual Studio 16 2019"
-| _**3**_ | Build                                             | $ cmake --build .       | c:\\..\\build>&nbsp;cmake&nbsp;--build&nbsp;.&nbsp;--config&nbsp;Release<br>You may prefer to open exiv2.sln and build using the IDE. |
-| _**4**_ | Optionally Run Test Suite                         | $ make tests            | c:\\..\\build>&nbsp;cmake&nbsp;--build&nbsp;.&nbsp;--config&nbsp;Release --target tests<br/>[README.md](README.md) |
-
-
+| _**2**_ | Get cmake to generate<br>makefiles or sln/vcxproj                        | $ cmake ..            | c:\\..\\build> cmake&nbsp;..&nbsp;-G&nbsp;"Visual Studio 16 2019"
+| _**3**_ | Build                                                                    | $ cmake --build .     | c:\\..\\build>&nbsp;cmake&nbsp;--build&nbsp;.&nbsp;--config&nbsp;Release<br>You may prefer to open exiv2.sln and build using the IDE. |
+| _**4**_ | Optionally Run Test Suite<br/>Test documentation: [README.md](README.md) | $ ctest               | c:\\..\\build>&nbsp;ctest -C Release |
 
 [TOC](#TOC)
 <name id="2"></a>
@@ -587,4 +585,4 @@ $ cmake -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON ..
 
 [TOC](#TOC)
 
-Written by Robin Mills<br>[email protected]<br>Updated: 2021-03-18
+Written by Robin Mills<br>[email protected]<br>Updated: 2021-12-17