Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 152 make tests #156

Merged
merged 3 commits into from
Dec 22, 2017
Merged

Fix 152 make tests #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9cc295
Fixes to the makefile
giovannipizzi Dec 22, 2017
5dc3ee6
Fixing the makefile and adding some docs for 'make tests'
giovannipizzi Dec 22, 2017
8c67479
Merge branch 'develop' into fix_152_make_tests
giovannipizzi Dec 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions test-suite/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions utility/w90pov/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
obj
w90pov
*.mod