#177 More corrections (plus Doxygen temporarily deactivated).

ExternalTools/Gitlab-CI/analysis.yml

@@ -11,7 +11,7 @@ valgrind-elasticity:
       paths:
           - memcheck_elasticity.txt
   after_script:
-      - rm -rf build_4_valgrind/
+      - rm -rf build4valgrind/
   only:
       - develop@morefem/corelibrary/morefem
       - /(valgrind)/

ExternalTools/Gitlab-CI/common.yml

@@ -127,44 +127,44 @@ variables:
     allow_failure: true    
     
 
-doxygen_basic:
-  <<: *run_doxygen_template
-  variables:
-      DOX: "basic_dev_guide.dox"
-      DOXYGEN_OUTPUT_FILE: "basic.log"
-
-doxygen_advanced:
-  <<: *run_doxygen_template
-  variables:
-      DOX: "advanced_dev_guide.dox"
-      DOXYGEN_OUTPUT_FILE: "advanced.log"
-
-doxygen_complete:
-  <<: *run_doxygen_template
-  variables:
-      DOX: "complete_dev_guide.dox"
-      DOXYGEN_OUTPUT_FILE: "complete.log"
-
-check_warning_doxygen_basic:
-  <<: *check_doxygen_warning_template
-  dependencies:
-      - doxygen_basic
-  variables:
-      DOXYGEN_OUTPUT_FILE: "basic.log"
-
-check_warning_doxygen_advanced:
-  <<: *check_doxygen_warning_template
-  dependencies:
-      - doxygen_advanced
-  variables:
-      DOXYGEN_OUTPUT_FILE: "advanced.log"
-
-check_warning_doxygen_complete:
-  <<: *check_doxygen_warning_template
-  dependencies:
-      - doxygen_complete
-  variables:
-      DOXYGEN_OUTPUT_FILE: "complete.log"
+# doxygen_basic:
+#   <<: *run_doxygen_template
+#   variables:
+#       DOX: "basic_dev_guide.dox"
+#       DOXYGEN_OUTPUT_FILE: "basic.log"
+#
+# doxygen_advanced:
+#   <<: *run_doxygen_template
+#   variables:
+#       DOX: "advanced_dev_guide.dox"
+#       DOXYGEN_OUTPUT_FILE: "advanced.log"
+#
+# doxygen_complete:
+#   <<: *run_doxygen_template
+#   variables:
+#       DOX: "complete_dev_guide.dox"
+#       DOXYGEN_OUTPUT_FILE: "complete.log"
+#
+# check_warning_doxygen_basic:
+#   <<: *check_doxygen_warning_template
+#   dependencies:
+#       - doxygen_basic
+#   variables:
+#       DOXYGEN_OUTPUT_FILE: "basic.log"
+#
+# check_warning_doxygen_advanced:
+#   <<: *check_doxygen_warning_template
+#   dependencies:
+#       - doxygen_advanced
+#   variables:
+#       DOXYGEN_OUTPUT_FILE: "advanced.log"
+#
+# check_warning_doxygen_complete:
+#   <<: *check_doxygen_warning_template
+#   dependencies:
+#       - doxygen_complete
+#   variables:
+#       DOXYGEN_OUTPUT_FILE: "complete.log"
 
 
 

Scripts/Tools/run_valgrind_elasticity.py

@@ -6,8 +6,9 @@ from run_valgrind_tools import buildAndRunValgrind
 
 if __name__ == "__main__":
 
-    morefem_model_instances_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..", "Sources", "ModelInstances")
+    morefem_root_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..")
+    morefem_model_instances_dir = os.path.join(morefem_root_dir, "Sources", "ModelInstances")
 
     lua_file = os.path.join(morefem_model_instances_dir, "Elasticity", "demo_2d_binary.lua")
 #
-    buildAndRunValgrind("MoReFEM4Elasticity",  lua_file, "memcheck_elasticity.txt")
+    buildAndRunValgrind("MoReFEM4Elasticity",  lua_file, os.path.join(morefem_root_dir, "memcheck_elasticity.txt"))