Commit 56ca3a10 authored by GILLES Sebastien's avatar GILLES Sebastien

#1496 Mistake somewhere overran run_verrou script; try to fix this.

parent 96d306da
...@@ -14,8 +14,8 @@ def MoReFEMRootDir(): ...@@ -14,8 +14,8 @@ def MoReFEMRootDir():
return pathlib.Path(os.path.dirname(os.path.realpath(__file__)), "..", "..", "..").resolve() return pathlib.Path(os.path.dirname(os.path.realpath(__file__)), "..", "..", "..").resolve()
class RunValgrind: class RunVerrou:
"""Compile the sources related to one executable and then run the Valgrind analysis on the executable. """Compile the sources related to one executable and then run the Verrou analysis on the executable.
\param[in] executable Executable to compile (e.g. MoReFEM4Elasticity). \param[in] executable Executable to compile (e.g. MoReFEM4Elasticity).
\param[in] lua_file Lua file with the data required to run the model. \param[in] lua_file Lua file with the data required to run the model.
...@@ -33,7 +33,7 @@ class RunValgrind: ...@@ -33,7 +33,7 @@ class RunValgrind:
try: try:
self._callCMake() self._callCMake()
self._compile() self._compile()
self._runValgrind() self._RunVerrou()
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print("Error in process: {}".format(e)) print("Error in process: {}".format(e))
sys.exit(e.returncode) sys.exit(e.returncode)
...@@ -58,22 +58,15 @@ class RunValgrind: ...@@ -58,22 +58,15 @@ class RunValgrind:
subprocess.run(cmd, shell = False).check_returncode() subprocess.run(cmd, shell = False).check_returncode()
def _runValgrind(self): def _RunVerrou(self):
os.environ["MOREFEM_ROOT"] = str(self.__morefem_root_dir) os.environ["MOREFEM_ROOT"] = str(self.__morefem_root_dir)
cmd = ["valgrind", cmd = ["valgrind",
"--error-exitcode=1", "--error-exitcode=1",
f"--log-file={self.__output}", f"--log-file={self.__output}",
"--gen-suppressions=all", "--tool=verrou",
"--show-leak-kinds=all", "--rounding-mode=random",
"--show-reachable=yes",
"--track-origins=yes",
"--leak-check=full",
"--errors-for-leak-kinds=all",
"--suppressions=../ExternalTools/Valgrind/openmpi.suppr",
"--suppressions=../ExternalTools/Valgrind/libgomp.suppr",
"--suppressions=../ExternalTools/Valgrind/libc.suppr",
self.__executable, self.__executable,
"-i", "-i",
self.__lua_file, self.__lua_file,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment