From e9cc295dc83e83b581e07831ec068174f6053379 Mon Sep 17 00:00:00 2001 From: Giovanni Pizzi Date: Fri, 22 Dec 2017 15:25:16 +0100 Subject: [PATCH 1/2] Fixes to the makefile --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index acd371a88..991557334 100644 --- a/Makefile +++ b/Makefile @@ -158,8 +158,14 @@ dist: ./CHANGE.log \ ) -test: - (cd $(ROOTDIR)/test-suite && $(MAKE) run-tests ) +test-serial: + (cd $(ROOTDIR)/test-suite && ./run_tests --category=default ) + +test-parallel: + (cd $(ROOTDIR)/test-suite && ./run_tests --category=default --numprocs=4 ) + +# Alias +tests: test-serial test-parallel dist-lite: @(cd $(ROOTDIR) && $(TAR) -cz --transform='s,^\./,wannier90/,' -f wannier90.tar.gz \ @@ -187,4 +193,4 @@ objdirp: then mkdir src/objp ; \ fi ) ; -.PHONY: wannier default all doc lib libs post clean veryclean thedoc dist test dist-lite objdir objdirp serialobjs +.PHONY: wannier default all doc lib libs post clean veryclean thedoc dist test-serial test-parallel dist-lite objdir objdirp serialobjs tests From 5dc3ee6f05ebf947e91731e75e13a54d67da5a7b Mon Sep 17 00:00:00 2001 From: Giovanni Pizzi Date: Fri, 22 Dec 2017 15:30:06 +0100 Subject: [PATCH 2/2] Fixing the makefile and adding some docs for 'make tests' --- Makefile | 2 +- test-suite/README.md | 5 +++++ utility/w90pov/.gitignore | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 991557334..d8857264d 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ clean: cd $(ROOTDIR)/test-suite && ./clean_tests veryclean: clean - cd $(ROOTDIR) && rm -f wannier90.x postw90.x libwannier.a + cd $(ROOTDIR) && rm -f wannier90.x postw90.x libwannier.a w90chk2chk.x cd $(ROOTDIR)/doc && rm -f user_guide.pdf tutorial.pdf cd $(ROOTDIR)/doc/user_guide && rm -f user_guide.ps cd $(ROOTDIR)/doc/tutorial && rm -f tutorial.ps diff --git a/test-suite/README.md b/test-suite/README.md index 17ebc9a53..9d6ed48f0 100644 --- a/test-suite/README.md +++ b/test-suite/README.md @@ -1,5 +1,10 @@ Wannier90 test suite +## Dependencies + +The code needs the `configparser` module, that can be installed e.g. via +`pip install --user configparser`. + ## How to write a new test ### Writing a new test for wannier90.x diff --git a/utility/w90pov/.gitignore b/utility/w90pov/.gitignore index ce3d6aaa2..572f077eb 100644 --- a/utility/w90pov/.gitignore +++ b/utility/w90pov/.gitignore @@ -1,2 +1,3 @@ obj w90pov +*.mod \ No newline at end of file