From 2d20d45866faee2f916e846967b91a1a836246d3 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 31 Mar 2015 09:54:42 +0000
Subject: xunit purpose modification

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/xunit@519 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: e9d555de2c1452010be4faa13178e86ae2b77e8d
---
 src/Alpha_shapes/test/Alpha_shapes_unit_test.cpp |  2 +-
 src/Alpha_shapes/test/CMakeLists.txt             | 12 ++++++++----
 src/Alpha_shapes/test/README                     |  4 +++-
 src/Bottleneck/test/CMakeLists.txt               | 11 +++++++----
 src/Persistent_cohomology/test/README            |  2 ++
 src/Simplex_tree/test/README                     |  2 ++
 6 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/Alpha_shapes/test/Alpha_shapes_unit_test.cpp b/src/Alpha_shapes/test/Alpha_shapes_unit_test.cpp
index a90704b6..b4c32321 100644
--- a/src/Alpha_shapes/test/Alpha_shapes_unit_test.cpp
+++ b/src/Alpha_shapes/test/Alpha_shapes_unit_test.cpp
@@ -20,7 +20,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define BOOST_TEST_MODULE alpha_shapes
+#define BOOST_TEST_MODULE alpha_shapes test
 #include <boost/test/included/unit_test.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/chrono/thread_clock.hpp>
diff --git a/src/Alpha_shapes/test/CMakeLists.txt b/src/Alpha_shapes/test/CMakeLists.txt
index a48c1a8f..98a935db 100644
--- a/src/Alpha_shapes/test/CMakeLists.txt
+++ b/src/Alpha_shapes/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(GUDHIAlphaShapesTest)
+project(GUDHIAlphaShapesUT)
 
 # need CGAL 4.6
 # cmake -DCGAL_DIR=~/workspace/CGAL-4.6-beta1 ../../..
@@ -16,9 +16,13 @@ if(CGAL_FOUND)
       include_directories (BEFORE "../../include")
 
       add_definitions(-DDEBUG_TRACES)
-      add_executable ( AlphaShapesUnitTest Alpha_shapes_unit_test.cpp )
-      target_link_libraries(AlphaShapesUnitTest  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-      add_test(AlphaShapesUnitTest ${CMAKE_CURRENT_BINARY_DIR}/AlphaShapesUnitTest)
+      add_executable ( AlphaShapesUT Alpha_shapes_unit_test.cpp )
+      target_link_libraries(AlphaShapesUT  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+      add_test(NAME AlphaShapesUT 
+        COMMAND ${CMAKE_CURRENT_BINARY_DIR}/AlphaShapesUT
+        # XML format for Jenkins xUnit plugin 
+        --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/AlphaShapesUT.xml --log_level=test_suite --report_level=no)
+
 
     else()
       message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
diff --git a/src/Alpha_shapes/test/README b/src/Alpha_shapes/test/README
index 244a2b84..cddd46ca 100644
--- a/src/Alpha_shapes/test/README
+++ b/src/Alpha_shapes/test/README
@@ -1,12 +1,14 @@
 To compile:
 ***********
 
+cd /path-to-gudhi/
 cmake .
+cd /path-to-test/
 make
 
 To launch with details:
 ***********************
 
-./AlphaShapesUnitTest --report_level=detailed --log_level=all 
+./AlphaShapesUT --report_level=detailed --log_level=all 
 
    ==> echo $? returns 0 in case of success (non-zero otherwise)
diff --git a/src/Bottleneck/test/CMakeLists.txt b/src/Bottleneck/test/CMakeLists.txt
index 7044372e..4492ab07 100644
--- a/src/Bottleneck/test/CMakeLists.txt
+++ b/src/Bottleneck/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(GUDHIBottleneckUnitTest)
+project(GUDHIBottleneckUT)
 
 if(NOT MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
@@ -7,11 +7,14 @@ if(NOT MSVC)
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --coverage")
 endif()
 
-add_executable ( BottleneckUnitTest bottleneck_unit_test.cpp )
-target_link_libraries(BottleneckUnitTest ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+add_executable ( BottleneckUT bottleneck_unit_test.cpp )
+target_link_libraries(BottleneckUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 # Unitary tests
-add_test(BottleneckUnitTest ${CMAKE_CURRENT_BINARY_DIR}/BottleneckUnitTest)
+add_test(NAME BottleneckUT 
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/BottleneckUT
+  # XML format for Jenkins xUnit plugin 
+  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/BottleneckUT.xml --log_level=test_suite --report_level=no)
 
 if (LCOV_PATH)
   # Lcov code coverage of unitary test
diff --git a/src/Persistent_cohomology/test/README b/src/Persistent_cohomology/test/README
index 428af77b..6c64b5fe 100644
--- a/src/Persistent_cohomology/test/README
+++ b/src/Persistent_cohomology/test/README
@@ -1,7 +1,9 @@
 To compile:
 ***********
 
+cd /path-to-gudhi/
 cmake .
+cd /path-to-test/
 make
 
 To launch with details:
diff --git a/src/Simplex_tree/test/README b/src/Simplex_tree/test/README
index bd8bf770..21c3d871 100644
--- a/src/Simplex_tree/test/README
+++ b/src/Simplex_tree/test/README
@@ -1,7 +1,9 @@
 To compile:
 ***********
 
+cd /path-to-gudhi/
 cmake .
+cd /path-to-test/
 make
 
 To launch with details:
-- 
cgit v1.2.3