Recover some changes lost during merge; stop retest if no error occurred during the previous run instead of performing
full test


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@13121 bac0169d-1eea-4375-b5f6-f89d2ced9994