Splitting of example05 into 3 tests where each sub-test uses a different

executable.
Example06 and example07 should in principle be splitted as well but we
do not do it for now (should find a better solution)....

test-suite/.gitignore

@@ -12,3 +12,10 @@ test_nnkpt*/wannier.werr
 test_basic2/wannier_band.gnu
 test_basic2/wannier_band.dat
 test_basic2/wannier_band.kpt
+pw_example0?_*/*.amn
+pw_example0?_*/*.mmn
+pw_example0?_*/*.eig
+pw_example0?_*/*.nnkp
+pw_example0?_*/*.wfc1
+pw_example0?_*/*.save
+pw_example0?_*/UNK*

test-suite/Makefile

@@ -36,27 +36,27 @@ prolog :
 
 run-tests : run-tests-wannier-serial
 
-run-tests-interface : prolog
+run-tests-interface : clean prolog
 	env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=interface_all
 
-run-tests-all : prolog
+run-tests-all : clean prolog
 	env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=test_all
 
 run-tests-parallel : run-tests-wannier-parallel
 
 run-custom-test : run-custom-test-serial
 
-run-tests-wannier-serial : prolog 
+run-tests-wannier-serial : clean prolog 
 	        env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=wannier_all
 
-run-tests-wannier-parallel : prolog 
+run-tests-wannier-parallel : clean prolog 
 	        env QE_USE_MPI=1 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=wannier_all
 
-run-custom-test-serial : prolog 
+run-custom-test-serial : clean prolog 
 	@if test -d $(testdir); then \
 	env QE_USE_MPI=0 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=$(testdir) ; fi
 
-run-custom-test-parallel : prolog 
+run-custom-test-parallel : clean prolog 
 	@if test -d $(testdir); then \
 	env QE_USE_MPI=1 ${TESTCODE_DIR}/bin/testcode.py --verbose --category=$(testdir) ; fi
 
@@ -75,6 +75,14 @@ clean:
 	@for x in `find example* -name "*.wout"`; do rm -rf $$x; done
 	@for x in `find pw_example* -name "test.*"`; do rm -rf $$x; done
 	@for x in `find pw_example* -name "*.wout"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.xsf"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.amn"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.mmn"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.eig"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.nnkp"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.wfc1"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "*.save"`; do rm -rf $$x; done
+	@for x in `find pw_example* -name "UNK*"`; do rm -rf $$x; done
 	@for x in `find test_* -name "test.*"`; do rm -rf $$x; done
 	@for x in `find test_* -name "*.wout"`; do rm -rf $$x; done
 	@for x in `find test_* -name "*.wpout"`; do rm -rf $$x; done

test-suite/config/run/run-wannier.sh

@@ -93,6 +93,8 @@ then
   echo "Running w90+postw90 for geninterp and checking for energies and derivatives ..."
   export TMP=$2
   export OUTPUT="${TMP%????}_geninterp.dat"
+  echo " ${WANNIER_ROOT}/wannier90.x $2 2> $4 # $3"
+  ${WANNIER_ROOT}/wannier90.x $2 2> ${4}_wan
   echo "${PARA_PREFIX} ${WANNIER_ROOT}/postw90.x $2 2> $4 # $3"
   ${PARA_PREFIX} ${WANNIER_ROOT}/postw90.x $2 2> $4
   cp $OUTPUT $3

test-suite/jobconfig

@@ -26,6 +26,9 @@ inputs_args = ('diamond.scf', '2'), ('diamond.nscf', '2'), ('diamond.win', '4'),
 program = WANNIER90
 inputs_args = ('diamond.scf', '2'), ('diamond.nscf', '2'), ('diamond.win', '4'), ('diamond.pw2wan', '3'), ('diamond.win', '1')
 
+# The next two tests are not splitted. This means that only Wannier is tested. 
+# If you want to test PWSCF for the two below you should split as above. 
+
 [pw_example06/]
 program = WANNIER90
 inputs_args = ('copper.scf', '2'), ('copper.nscf', '2'), ('copper.win', '4'), ('copper.pw2wan', '3'), ('copper.win', '1')
@@ -75,8 +78,8 @@ program = WANNIER90
 inputs_args = ('wannier.win', '6')
 
 [test_si_geninterp/]
-program = WANNIER90
-inputs_args = ('silicon.win', '1'), ('silicon.win', '7')
+program = POSTW90GENINTERP
+inputs_args = ('silicon.win', '7')
 
 [categories]
 wannier_all = example*??  test_* wan_*