Merge pull request #669 from thelfer/667-reduce-the-size-of-files-pat…

…hs-in-sources-to-fit-in-windowss-max_path-limit 667 reduce the size of files paths in sources to fit in windowss max path limit
thelfer · Dec 21, 2024 · 71e1263 · 71e1263
2 parents 8868ecb + e4e5e19
commit 71e1263
Show file tree

Hide file tree

Showing 308 changed files with 1,044 additions and 1,042 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -481,6 +481,7 @@ if(CMAKE_HOST_WIN32 OR CYGWIN OR MSYS)
   else(MSYS)
      set(TFEL_BINARY_DIR "${PROJECT_BINARY_DIR}")
   endif(MSYS)	      
+  cmake_path(NATIVE_PATH TFEL_BINARY_DIR NORMALIZE TFEL_BINARY_DIR_NATIVE_PATH)  
   if(CMAKE_CONFIGURATION_TYPES)
     foreach(conf ${CMAKE_CONFIGURATION_TYPES})
       set(TFEL_CONF_DIR "/${conf}")

diff --git a/cmake/modules/tfel.cmake b/cmake/modules/tfel.cmake
@@ -452,7 +452,7 @@ function(mfront_behaviour_check_library lib interface)
 endfunction(mfront_behaviour_check_library)
 
 function(mfront_behaviour_brick_check_library lib dir interface)
-  mfront_check_library_base(${lib} ${interface} "behaviours/bricks/${dir}" ON ${ARGN})
+  mfront_check_library_base(${lib} ${interface} "behaviours/${dir}" ON ${ARGN})
 endfunction(mfront_behaviour_brick_check_library)
 
 function(mfront_model_check_library lib interface)

diff --git a/env-win32.bat.in b/env-win32.bat.in
@@ -1,13 +1,13 @@
-set PATH=@TFEL_BINARY_DIR@/mtest/src@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/mfront/src@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/NUMODIS@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Material@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Tests@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Math@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Utilities@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Exception@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Glossary@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/System@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Config@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/PhysicalConstants@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/UnicodeSupport@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\mtest\src@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\mfront\src@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\NUMODIS@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Material@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Tests@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Math@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Utilities@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Exception@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Glossary@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\System@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Config@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\PhysicalConstants@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\UnicodeSupport@TFEL_CONF_DIR@;%PATH%
diff --git a/mfront-query/tests/CMakeLists.txt b/mfront-query/tests/CMakeLists.txt
@@ -52,7 +52,7 @@ endmacro(mfront_query_test)
 
 mfront_query_test("--material-properties" "Norton.mfront"
   "mfront-query-norton-material-properites.ref")
-mfront_query_test("--slip-systems-by-index" "bricks/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront"
+mfront_query_test("--slip-systems-by-index" "FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront"
   "mfront-query-finitestrainsinglecrystal.ref")
 # mfront_query_test("--state-variables" "Norton.mfront"
 #   "mfront-query-norton-material-properites.ref")
diff --git a/mfront/tests/behaviours/CMakeLists.txt b/mfront/tests/behaviours/CMakeLists.txt
@@ -1,5 +1,11 @@
 add_subdirectory(unit-tests)
-add_subdirectory(bricks)
+# bricks
+add_subdirectory(StandardElasticity)
+add_subdirectory(StandardElastoViscoPlasticity)
+add_subdirectory(FiniteStrainSingleCrystal)
+add_subdirectory(DDIF2)
+
+# tests related to specific interfaces or algorithms
 add_subdirectory(generic)
 if(HAVE_CASTEM)
   add_subdirectory(castem)

diff --git a/mfront/tests/behaviours/DDIF2/CMakeLists.txt b/mfront/tests/behaviours/DDIF2/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory(castem)
+# add_subdirectory(aster)
+
+install_mfront_data(tests/behaviours/DDIF2 DDIF2.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_2.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_3.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_4.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_5.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_6.mfront)
+
diff --git a/...ests/behaviours/bricks/DDIF2/DDIF2.mfront → mfront/tests/behaviours/DDIF2/DDIF2.mfront b/...ests/behaviours/bricks/DDIF2/DDIF2.mfront → mfront/tests/behaviours/DDIF2/DDIF2.mfront
diff --git a/...ts/behaviours/bricks/DDIF2/DDIF2_2.mfront → mfront/tests/behaviours/DDIF2/DDIF2_2.mfront b/...ts/behaviours/bricks/DDIF2/DDIF2_2.mfront → mfront/tests/behaviours/DDIF2/DDIF2_2.mfront
diff --git a/...ts/behaviours/bricks/DDIF2/DDIF2_3.mfront → mfront/tests/behaviours/DDIF2/DDIF2_3.mfront b/...ts/behaviours/bricks/DDIF2/DDIF2_3.mfront → mfront/tests/behaviours/DDIF2/DDIF2_3.mfront
diff --git a/...ts/behaviours/bricks/DDIF2/DDIF2_4.mfront → mfront/tests/behaviours/DDIF2/DDIF2_4.mfront b/...ts/behaviours/bricks/DDIF2/DDIF2_4.mfront → mfront/tests/behaviours/DDIF2/DDIF2_4.mfront
diff --git a/...ts/behaviours/bricks/DDIF2/DDIF2_5.mfront → mfront/tests/behaviours/DDIF2/DDIF2_5.mfront b/...ts/behaviours/bricks/DDIF2/DDIF2_5.mfront → mfront/tests/behaviours/DDIF2/DDIF2_5.mfront
diff --git a/...ts/behaviours/bricks/DDIF2/DDIF2_6.mfront → mfront/tests/behaviours/DDIF2/DDIF2_6.mfront b/...ts/behaviours/bricks/DDIF2/DDIF2_6.mfront → mfront/tests/behaviours/DDIF2/DDIF2_6.mfront
diff --git a/...viours/bricks/DDIF2/castem/CMakeLists.txt → ...ts/behaviours/DDIF2/castem/CMakeLists.txt b/...viours/bricks/DDIF2/castem/CMakeLists.txt → ...ts/behaviours/DDIF2/castem/CMakeLists.txt
@@ -53,11 +53,11 @@ macro(castemtest_ddif2brick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/DDIF2/castem"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/DDIF2/castem"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/DDIF2/castem"
+	DESTINATION "share/doc/mfront/tests/behaviours/DDIF2/castem"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)

diff --git a/...ehaviours/bricks/DDIF2/castem/ddif2.mtest → ...tests/behaviours/DDIF2/castem/ddif2.mtest b/...ehaviours/bricks/DDIF2/castem/ddif2.mtest → ...tests/behaviours/DDIF2/castem/ddif2.mtest
diff --git a/...aviours/bricks/DDIF2/castem/ddif2_2.mtest → ...sts/behaviours/DDIF2/castem/ddif2_2.mtest b/...aviours/bricks/DDIF2/castem/ddif2_2.mtest → ...sts/behaviours/DDIF2/castem/ddif2_2.mtest
diff --git a/...aviours/bricks/DDIF2/castem/ddif2_3.mtest → ...sts/behaviours/DDIF2/castem/ddif2_3.mtest b/...aviours/bricks/DDIF2/castem/ddif2_3.mtest → ...sts/behaviours/DDIF2/castem/ddif2_3.mtest
diff --git a/...aviours/bricks/DDIF2/castem/ddif2_4.mtest → ...sts/behaviours/DDIF2/castem/ddif2_4.mtest b/...aviours/bricks/DDIF2/castem/ddif2_4.mtest → ...sts/behaviours/DDIF2/castem/ddif2_4.mtest
diff --git a/...aviours/bricks/DDIF2/castem/ddif2_5.mtest → ...sts/behaviours/DDIF2/castem/ddif2_5.mtest b/...aviours/bricks/DDIF2/castem/ddif2_5.mtest → ...sts/behaviours/DDIF2/castem/ddif2_5.mtest
diff --git a/...aviours/bricks/DDIF2/castem/ddif2_6.mtest → ...sts/behaviours/DDIF2/castem/ddif2_6.mtest b/...aviours/bricks/DDIF2/castem/ddif2_6.mtest → ...sts/behaviours/DDIF2/castem/ddif2_6.mtest
diff --git a/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_subdirectory(castem)
+add_subdirectory(aster)
+
+install_mfront_data(tests/behaviours/FiniteStrainSingleCrystal FiniteStrainSingleCrystal.mfront)
+install_mfront_data(tests/behaviours/FiniteStrainSingleCrystal FiniteStrainSingleCrystal_NumericalJacobian.mfront)
diff --git a/...eCrystal/FiniteStrainSingleCrystal.mfront → ...eCrystal/FiniteStrainSingleCrystal.mfront b/...eCrystal/FiniteStrainSingleCrystal.mfront → ...eCrystal/FiniteStrainSingleCrystal.mfront
diff --git a/...ainSingleCrystal_NumericalJacobian.mfront → ...ainSingleCrystal_NumericalJacobian.mfront b/...ainSingleCrystal_NumericalJacobian.mfront → ...ainSingleCrystal_NumericalJacobian.mfront
diff --git a/...eStrainSingleCrystal/aster/CMakeLists.txt → ...eStrainSingleCrystal/aster/CMakeLists.txt b/...eStrainSingleCrystal/aster/CMakeLists.txt → ...eStrainSingleCrystal/aster/CMakeLists.txt
@@ -39,11 +39,11 @@ macro(astertest_finitestrainsinglecrystalbrick test_arg behaviour)
     endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/FiniteStrainSingleCrystal/aster/"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/"
+	DESTINATION "share/doc/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_ASTER)

diff --git a/...aster/finitestrainsinglecrystal-012.mtest → ...aster/finitestrainsinglecrystal-012.mtest b/...aster/finitestrainsinglecrystal-012.mtest → ...aster/finitestrainsinglecrystal-012.mtest
diff --git a/...aster/finitestrainsinglecrystal-159.mtest → ...aster/finitestrainsinglecrystal-159.mtest b/...aster/finitestrainsinglecrystal-159.mtest → ...aster/finitestrainsinglecrystal-159.mtest
diff --git a/...StrainSingleCrystal/castem/CMakeLists.txt → ...StrainSingleCrystal/castem/CMakeLists.txt b/...StrainSingleCrystal/castem/CMakeLists.txt → ...StrainSingleCrystal/castem/CMakeLists.txt
@@ -55,11 +55,11 @@ macro(castemtest_finitestrainsinglecrystalbrick test_arg behaviour)
     endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/FiniteStrainSingleCrystal/castem/"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/FiniteStrainSingleCrystal/castem/"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/castem/"
+	DESTINATION "share/doc/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)

diff --git a/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_subdirectory(aster)
+add_subdirectory(castem)
+add_subdirectory(cyrano)
+
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity2.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity3.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity4.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity5.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity7.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity8.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity9.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity10.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity11.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity12.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity13.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity OrthotropicStandardElasticity.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity OrthotropicStandardElasticity2.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity OrthotropicStandardElasticity3.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity TestComputeElasticPrediction.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity TestComputeElasticPrediction2.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity SingleCrystal_DD_FCC.mfront)
diff --git a/...rdElasticity/IsotropicJ2Plasticity.mfront → ...rdElasticity/IsotropicJ2Plasticity.mfront b/...rdElasticity/IsotropicJ2Plasticity.mfront → ...rdElasticity/IsotropicJ2Plasticity.mfront
diff --git a/...ticity/IsotropicStandardElasticity.mfront → ...ticity/IsotropicStandardElasticity.mfront b/...ticity/IsotropicStandardElasticity.mfront → ...ticity/IsotropicStandardElasticity.mfront
diff --git a/...city/IsotropicStandardElasticity10.mfront → ...city/IsotropicStandardElasticity10.mfront b/...city/IsotropicStandardElasticity10.mfront → ...city/IsotropicStandardElasticity10.mfront
diff --git a/...city/IsotropicStandardElasticity11.mfront → ...city/IsotropicStandardElasticity11.mfront b/...city/IsotropicStandardElasticity11.mfront → ...city/IsotropicStandardElasticity11.mfront
diff --git a/...city/IsotropicStandardElasticity12.mfront → ...city/IsotropicStandardElasticity12.mfront b/...city/IsotropicStandardElasticity12.mfront → ...city/IsotropicStandardElasticity12.mfront
diff --git a/...city/IsotropicStandardElasticity13.mfront → ...city/IsotropicStandardElasticity13.mfront b/...city/IsotropicStandardElasticity13.mfront → ...city/IsotropicStandardElasticity13.mfront
diff --git a/...icity/IsotropicStandardElasticity2.mfront → ...icity/IsotropicStandardElasticity2.mfront b/...icity/IsotropicStandardElasticity2.mfront → ...icity/IsotropicStandardElasticity2.mfront
diff --git a/...icity/IsotropicStandardElasticity3.mfront → ...icity/IsotropicStandardElasticity3.mfront b/...icity/IsotropicStandardElasticity3.mfront → ...icity/IsotropicStandardElasticity3.mfront
diff --git a/...icity/IsotropicStandardElasticity4.mfront → ...icity/IsotropicStandardElasticity4.mfront b/...icity/IsotropicStandardElasticity4.mfront → ...icity/IsotropicStandardElasticity4.mfront
diff --git a/...icity/IsotropicStandardElasticity5.mfront → ...icity/IsotropicStandardElasticity5.mfront b/...icity/IsotropicStandardElasticity5.mfront → ...icity/IsotropicStandardElasticity5.mfront
diff --git a/...icity/IsotropicStandardElasticity6.mfront → ...icity/IsotropicStandardElasticity6.mfront b/...icity/IsotropicStandardElasticity6.mfront → ...icity/IsotropicStandardElasticity6.mfront
diff --git a/...icity/IsotropicStandardElasticity7.mfront → ...icity/IsotropicStandardElasticity7.mfront b/...icity/IsotropicStandardElasticity7.mfront → ...icity/IsotropicStandardElasticity7.mfront
diff --git a/...icity/IsotropicStandardElasticity8.mfront → ...icity/IsotropicStandardElasticity8.mfront b/...icity/IsotropicStandardElasticity8.mfront → ...icity/IsotropicStandardElasticity8.mfront
diff --git a/...icity/IsotropicStandardElasticity9.mfront → ...icity/IsotropicStandardElasticity9.mfront b/...icity/IsotropicStandardElasticity9.mfront → ...icity/IsotropicStandardElasticity9.mfront
diff --git a/...city/OrthotropicStandardElasticity.mfront → ...city/OrthotropicStandardElasticity.mfront b/...city/OrthotropicStandardElasticity.mfront → ...city/OrthotropicStandardElasticity.mfront
diff --git a/...ity/OrthotropicStandardElasticity2.mfront → ...ity/OrthotropicStandardElasticity2.mfront b/...ity/OrthotropicStandardElasticity2.mfront → ...ity/OrthotropicStandardElasticity2.mfront
diff --git a/...ity/OrthotropicStandardElasticity3.mfront → ...ity/OrthotropicStandardElasticity3.mfront b/...ity/OrthotropicStandardElasticity3.mfront → ...ity/OrthotropicStandardElasticity3.mfront
diff --git a/...ardElasticity/SingleCrystal_DD_FCC.mfront → ...ardElasticity/SingleCrystal_DD_FCC.mfront b/...ardElasticity/SingleCrystal_DD_FCC.mfront → ...ardElasticity/SingleCrystal_DD_FCC.mfront
diff --git a/...icity/TestComputeElasticPrediction.mfront → ...icity/TestComputeElasticPrediction.mfront b/...icity/TestComputeElasticPrediction.mfront → ...icity/TestComputeElasticPrediction.mfront
diff --git a/...city/TestComputeElasticPrediction2.mfront → ...city/TestComputeElasticPrediction2.mfront b/...city/TestComputeElasticPrediction2.mfront → ...city/TestComputeElasticPrediction2.mfront
diff --git a/...s/StandardElasticity/aster/CMakeLists.txt → ...s/StandardElasticity/aster/CMakeLists.txt b/...s/StandardElasticity/aster/CMakeLists.txt → ...s/StandardElasticity/aster/CMakeLists.txt
@@ -39,11 +39,11 @@ macro(astertest_standardelasticitybrick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElasticity/aster"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElasticity/aster"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElasticity/aster"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElasticity/aster"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_ASTER)

diff --git a/...asticity/aster/singlecrystal_dd_cfc.mtest → ...asticity/aster/singlecrystal_dd_cfc.mtest b/...asticity/aster/singlecrystal_dd_cfc.mtest → ...asticity/aster/singlecrystal_dd_cfc.mtest
diff --git a/.../StandardElasticity/castem/CMakeLists.txt → .../StandardElasticity/castem/CMakeLists.txt b/.../StandardElasticity/castem/CMakeLists.txt → .../StandardElasticity/castem/CMakeLists.txt
@@ -86,11 +86,11 @@ macro(castemtest_standardelasticitybrick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElasticity/castem"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElasticity/castem"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElasticity/castem"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElasticity/castem"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)

diff --git a/...ticity/castem/isotropicj2plasticity.mtest → ...ticity/castem/isotropicj2plasticity.mtest b/...ticity/castem/isotropicj2plasticity.mtest → ...ticity/castem/isotropicj2plasticity.mtest
diff --git a/.../castem/isotropicstandardelasticity.mtest → .../castem/isotropicstandardelasticity.mtest b/.../castem/isotropicstandardelasticity.mtest → .../castem/isotropicstandardelasticity.mtest
diff --git a/...castem/isotropicstandardelasticity2.mtest → ...castem/isotropicstandardelasticity2.mtest b/...castem/isotropicstandardelasticity2.mtest → ...castem/isotropicstandardelasticity2.mtest
diff --git a/...castem/isotropicstandardelasticity3.mtest → ...castem/isotropicstandardelasticity3.mtest b/...castem/isotropicstandardelasticity3.mtest → ...castem/isotropicstandardelasticity3.mtest
diff --git a/...castem/isotropicstandardelasticity4.mtest → ...castem/isotropicstandardelasticity4.mtest b/...castem/isotropicstandardelasticity4.mtest → ...castem/isotropicstandardelasticity4.mtest
diff --git a/...castem/isotropicstandardelasticity5.mtest → ...castem/isotropicstandardelasticity5.mtest b/...castem/isotropicstandardelasticity5.mtest → ...castem/isotropicstandardelasticity5.mtest
diff --git a/...castem/isotropicstandardelasticity6.mtest → ...castem/isotropicstandardelasticity6.mtest b/...castem/isotropicstandardelasticity6.mtest → ...castem/isotropicstandardelasticity6.mtest
diff --git a/...castem/isotropicstandardelasticity7.mtest → ...castem/isotropicstandardelasticity7.mtest b/...castem/isotropicstandardelasticity7.mtest → ...castem/isotropicstandardelasticity7.mtest
diff --git a/...astem/orthotropicstandardelasticity.mtest → ...astem/orthotropicstandardelasticity.mtest b/...astem/orthotropicstandardelasticity.mtest → ...astem/orthotropicstandardelasticity.mtest
diff --git a/...castem/testcomputeelasticprediction.mtest → ...castem/testcomputeelasticprediction.mtest b/...castem/testcomputeelasticprediction.mtest → ...castem/testcomputeelasticprediction.mtest
diff --git a/...astem/testcomputeelasticprediction2.mtest → ...astem/testcomputeelasticprediction2.mtest b/...astem/testcomputeelasticprediction2.mtest → ...astem/testcomputeelasticprediction2.mtest
diff --git a/...astem/testcomputeelasticprediction3.mtest → ...astem/testcomputeelasticprediction3.mtest b/...astem/testcomputeelasticprediction3.mtest → ...astem/testcomputeelasticprediction3.mtest
diff --git a/...astem/testcomputeelasticprediction4.mtest → ...astem/testcomputeelasticprediction4.mtest b/...astem/testcomputeelasticprediction4.mtest → ...astem/testcomputeelasticprediction4.mtest
diff --git a/.../StandardElasticity/cyrano/CMakeLists.txt → .../StandardElasticity/cyrano/CMakeLists.txt b/.../StandardElasticity/cyrano/CMakeLists.txt → .../StandardElasticity/cyrano/CMakeLists.txt
@@ -66,11 +66,11 @@ macro(cyranotest_standardelasticitybrick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElasticity/cyrano/"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElasticity/cyrano/"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElasticity/cyrano/"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CYRANO)

diff --git a/.../cyrano/isotropicstandardelasticity.mtest → .../cyrano/isotropicstandardelasticity.mtest b/.../cyrano/isotropicstandardelasticity.mtest → .../cyrano/isotropicstandardelasticity.mtest
diff --git a/...cyrano/testcomputeelasticprediction.mtest → ...cyrano/testcomputeelasticprediction.mtest b/...cyrano/testcomputeelasticprediction.mtest → ...cyrano/testcomputeelasticprediction.mtest
diff --git a/...yrano/testcomputeelasticprediction2.mtest → ...yrano/testcomputeelasticprediction2.mtest b/...yrano/testcomputeelasticprediction2.mtest → ...yrano/testcomputeelasticprediction2.mtest
diff --git a/...yrano/testcomputeelasticprediction3.mtest → ...yrano/testcomputeelasticprediction3.mtest b/...yrano/testcomputeelasticprediction3.mtest → ...yrano/testcomputeelasticprediction3.mtest
diff --git a/...yrano/testcomputeelasticprediction4.mtest → ...yrano/testcomputeelasticprediction4.mtest b/...yrano/testcomputeelasticprediction4.mtest → ...yrano/testcomputeelasticprediction4.mtest