Skip to content
Snippets Groups Projects
Commit 72e09372 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Added Make target check and installcheck

Notice that this breaks previous "check" target, that I think
was anyway useless.

check: does the check with the non-installed plumed
installedcheck: does the check with the installed plumed
parent a4be6b3d
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ SUBDIRS := $(SRCDIRS) user-doc developer-doc regtest macports vim astyle ...@@ -13,7 +13,7 @@ SUBDIRS := $(SRCDIRS) user-doc developer-doc regtest macports vim astyle
SUBDIRSCLEAN:=$(addsuffix .clean,$(SUBDIRS)) SUBDIRSCLEAN:=$(addsuffix .clean,$(SUBDIRS))
.PHONY: all lib clean $(SRCDIRS) doc docclean check cppcheck distclean all_plus_docs macports codecheck plumedcheck astyle .PHONY: all lib clean $(SRCDIRS) doc docclean check installcheck cppcheck distclean all_plus_docs macports codecheck plumedcheck astyle
# if machine dependent configuration has been found: # if machine dependent configuration has been found:
ifdef GCCDEP ifdef GCCDEP
...@@ -59,8 +59,15 @@ docs: ...@@ -59,8 +59,15 @@ docs:
$(MAKE) doc $(MAKE) doc
# regtests # regtests
check: src test # perform tests using non-installed plumed
$(MAKE) -C regtest check:
PLUMED_PREPEND_PATH="$(realpath .)/src/lib" $(MAKE) -C regtest
$(MAKE) -C regtest checkfail
# perform tests using the installed version of plumed
installcheck:
PLUMED_PREPEND_PATH="$(bindir)" PLUMED_PROGRAM_NAME="$(program_name)" $(MAKE) -C regtest
$(MAKE) -C regtest checkfail
else else
......
#!/bin/bash #!/bin/bash
if test -n "$PLUMED_PREPEND_PATH" ; then
PATH="$PLUMED_PREPEND_PATH:$PATH"
fi
export valgrind=env export valgrind=env
for opt in ${*} for opt in ${*}
...@@ -46,7 +50,7 @@ echo "++ Arguments: $arg" ...@@ -46,7 +50,7 @@ echo "++ Arguments: $arg"
echo "++ Processors: $mpiprocs" echo "++ Processors: $mpiprocs"
mpi=env mpi=env
plumed=plumed plumed="${PLUMED_PROGRAM_NAME:-plumed}"
root=$($plumed --no-mpi info --root) root=$($plumed --no-mpi info --root)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment