Merge last trunk modifications

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

Former-commit-id: 3d0a3b2988bbbd0baa19fc09ba77e4e58e330a89

1 files changed, 2 insertions, 4 deletions

diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp
index 6a7ecbec..3537cfa4 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp
@@ -22,11 +22,9 @@ using namespace boost::unit_test;
 typedef Simplex_tree<> typeST;
 
 std::string test_rips_persistence(int min_coefficient, int max_coefficient, double min_persistence) {
-  // file name is given as parameter from CMakeLists.txt
-  const std::string inputFile(framework::master_test_suite().argv[1]);
-
+  // file is copied in CMakeLists.txt
   std::ifstream simplex_tree_stream;
-  simplex_tree_stream.open(inputFile.c_str());
+  simplex_tree_stream.open("simplex_tree_file_for_multi_field_unit_test.txt");
   typeST st;
   simplex_tree_stream >> st;
   simplex_tree_stream.close();