[geos-commits] [SCM] GEOS branch master updated. aaf468f51390972ebc55e6621ba25268ff7bb624

git at osgeo.org git at osgeo.org
Tue Oct 8 14:26:01 PDT 2019


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  aaf468f51390972ebc55e6621ba25268ff7bb624 (commit)
      from  518c382a0ced3eeca1155a3648ba78753409b9c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aaf468f51390972ebc55e6621ba25268ff7bb624
Author: Daniel Baston <dbaston at gmail.com>
Date:   Tue Oct 8 17:25:47 2019 -0400

    Provide more XML test output on failure

diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 97a3d7f..b99cc0b 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -28,7 +28,7 @@ foreach(_testdir general issue misc robust validate)
     file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/tests/${_testdir}/*.xml CONFIGURE_DEPEND)
     foreach(_testfile ${_testfiles})
         get_filename_component(_testname ${_testfile} NAME_WE)
-        add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester --test-valid-output ${_testfile})
+        add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester -v --test-valid-output ${_testfile})
     endforeach()
 endforeach()
 unset(_testdir)
diff --git a/tests/xmltester/XMLTester.cpp b/tests/xmltester/XMLTester.cpp
index d94a452..aa02b95 100644
--- a/tests/xmltester/XMLTester.cpp
+++ b/tests/xmltester/XMLTester.cpp
@@ -367,8 +367,9 @@ XMLTester::printTest(bool success, const std::string& expected_result, const std
         std::cout << ": " << (success ? "ok." : "failed.");
         std::cout << " (" << std::setprecision(15) << java_math_round(prof.getTot() / 1000) << " ms)" << std::endl;
 
-        // print geometry etc for -v -v and above
-        if (verbose > 1) {
+        // print geometry on failure for -v
+        // print geometry no matter what for -v -v and above
+        if (verbose > 1 || (verbose == 1 && !success)) {
             std::cout << "\tDescription: " << curr_case_desc << std::endl;
 
             if(gA) {

-----------------------------------------------------------------------

Summary of changes:
 tests/xmltester/CMakeLists.txt | 2 +-
 tests/xmltester/XMLTester.cpp  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list