Run test suite also for json files

diff --git a/cmake/macros/macro_deal_ii_add_test.cmake b/cmake/macros/macro_deal_ii_add_test.cmake
index 42dea34149e66a5c49beaace23e15ecea5de7c69..92269949da40397c76f51fda3ae42faffaf4021c 100644 (file)
--- a/cmake/macros/macro_deal_ii_add_test.cmake
+++ b/cmake/macros/macro_deal_ii_add_test.cmake
@@ -206,7 +206,25 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file)
           "$<TARGET_FILE:${_target}>"
           "${_prm_file}"
           )
+      ELSEIF( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.json")
+        # the same as above but for json files
+        SET(_json_file "${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.json")
 
+        IF(NOT "${TEST_TARGET_${_build}}" STREQUAL "")
+          SET(_target ${TEST_TARGET_${_build}})
+        ELSEIF(NOT "${TEST_TARGET}" STREQUAL "")
+          SET(_target ${TEST_TARGET})
+        ELSE()
+          MESSAGE(FATAL_ERROR
+            "\nFor ${_comparison_file}: \"${_test_name}.json\" provided, "
+            "but neither \"\${TEST_TARGET}\", nor \"\${TEST_TARGET_${_build}}"
+            "\" is defined.\n\n"
+            )
+        ENDIF()
+        SET(_run_args
+          "$<TARGET_FILE:${_target}>"
+          "${_json_file}"
+          )
       ELSE()
         MESSAGE(FATAL_ERROR
           "\nFor ${_comparison_file}: Neither \"${_test_name}.cc\", "

diff --git a/doc/news/changes/minor/20200817Munch b/doc/news/changes/minor/20200817Munch
new file mode 100644 (file)
index 0000000..b3daddb
--- /dev/null
+++ b/doc/news/changes/minor/20200817Munch
@@ -0,0 +1,3 @@
+New: The test suite can now also be run with .json files.
+<br>
+(Peter Munch, 2020/08/17)

diff --git a/doc/users/testsuite.html b/doc/users/testsuite.html
index e75b5ed25d460025aa6cb1baf7e1120b9feeb2e9..3d1303d85e5039b418572e92bc4d6b31d0692705 100644 (file)
--- a/doc/users/testsuite.html
+++ b/doc/users/testsuite.html
@@ -65,6 +65,13 @@ my_test_2.output</pre>
       variable) is invoked with the path of <code>my_test_2.prm</code> as
       first argument. Again, its screen output is compared against
       <code>my_test_2.output</code>
+      <pre>
+my_test_3.json
+my_test_3.output</pre>
+      Just like in the last case, an already built executable (that is defined by a CMake
+      variable) is invoked with the path of <code>my_test_3.json</code> as
+      first argument. Again, its screen output is compared against
+      <code>my_test_3.output</code>
     </p>
 
     <a name="examples"></a>