Commit b8bb9186 authored by Uliana Alekseeva's avatar Uliana Alekseeva

Merge branch 'develop' of iffgit.fz-juelich.de:fleur/fleur into develop

parents af8f5a45 57840392
...@@ -31,7 +31,9 @@ test-gfortran: ...@@ -31,7 +31,9 @@ test-gfortran:
script: script:
- ulimit -s unlimited ;export juDFT_MPI="mpirun -n 2 --allow-run-as-root ";cd /builds/fleur/fleur/build;ctest - ulimit -s unlimited ;export juDFT_MPI="mpirun -n 2 --allow-run-as-root ";cd /builds/fleur/fleur/build;ctest
artifacts: artifacts:
when: on_failure
paths: paths:
- build/Testing/failed
- build/Testing/test.oldlogs - build/Testing/test.oldlogs
# only: # only:
# - schedules # - schedules
...@@ -98,7 +100,7 @@ build-intel: ...@@ -98,7 +100,7 @@ build-intel:
- build.intel - build.intel
script: script:
- set +e && source compilervars.sh intel64 && set -e ; ulimit -s unlimited - set +e && source compilervars.sh intel64 && set -e ; ulimit -s unlimited
- cd /builds/fleur/fleur; FC=mpiifort FLEUR_LIBRARIES="-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64" ./configure.sh -l intel AUTO ; cd build.intel; make - cd /builds/fleur/fleur; FC=mpiifort FLEUR_LIBRARIES="-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64" ./configure.sh -t -l intel AUTO ; cd build.intel; make
only: only:
- schedules - schedules
- triggers - triggers
...@@ -114,6 +116,11 @@ test-intel: ...@@ -114,6 +116,11 @@ test-intel:
script: script:
- set +e && source compilervars.sh intel64 && set -e; ulimit -s unlimited - set +e && source compilervars.sh intel64 && set -e; ulimit -s unlimited
- cd /builds/fleur/fleur/build.intel;ctest - cd /builds/fleur/fleur/build.intel;ctest
artifacts:
when: on_failure
paths:
- build/Testing/failed
- build/Testing/test.oldlogs
only: only:
- schedules - schedules
- web - web
......
...@@ -164,6 +164,12 @@ sub testresult($){ ...@@ -164,6 +164,12 @@ sub testresult($){
}else{ }else{
system("touch $workdir/test.failed"); system("touch $workdir/test.failed");
system("echo 'TEST FAILED:OUT' >> ../failed");
system("cat out >> ../failed");
system("echo 'TEST FAILED:stdout' >> ../failed");
system("cat ../Temporary/LastTest.log >> ../failed");
system("echo 'TEST FAILED:testreport' >> ../failed");
system("cat ../test.log >> ../failed");
print "Test failed\n"; print "Test failed\n";
die "Test failed"; die "Test failed";
} }
......
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