diff options
| author | albert-github <albert.tests@gmail.com> | 2020-06-08 16:26:52 (GMT) |
|---|---|---|
| committer | albert-github <albert.tests@gmail.com> | 2020-06-08 16:26:52 (GMT) |
| commit | 2f19e7322f6c082b09252c285753056f359a1eb6 (patch) | |
| tree | bca0740e3e387b7bbc0cfd805fa6290a4c340733 /testing/runtests.py | |
| parent | 95f9c89d6aa0008321c2ee8a0f3b1a4602789395 (diff) | |
| download | Doxygen-2f19e7322f6c082b09252c285753056f359a1eb6.zip Doxygen-2f19e7322f6c082b09252c285753056f359a1eb6.tar.gz Doxygen-2f19e7322f6c082b09252c285753056f359a1eb6.tar.bz2 | |
LaTeX test were hanging for a.o. Hungarian on Windows
On Windows a number of tests were hanging when using a language like Hungarian, Russian.
The handling of the output of the output is now done differently for Windows and other OS
A small (but obvious) error has been corrected (failed_html -> failed_latex), has no effect on the output / results though.
Diffstat (limited to 'testing/runtests.py')
| -rwxr-xr-x | testing/runtests.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/testing/runtests.py b/testing/runtests.py index 10fe502..7896cdd 100755 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -366,10 +366,13 @@ class Tester: if (self.args.pdf): failed_latex=False latex_output='%s/latex' % self.test_out + # with languages like Hungarian we had problems with some tests on windows when stderr was used. if (sys.platform == 'win32'): + outType=False redirl='>nul: 2>temp' mk='make.bat' else: + outType=True redirl='>/dev/null 2>temp' mk='make' cur_directory = os.getcwd() @@ -377,18 +380,22 @@ class Tester: exe_string = mk exe_string1 = exe_string exe_string += ' %s' % (redirl) - exe_string += ' %s more temp' % (separ) - latex_out = xpopen(exe_string,exe_string1,getStderr=True) + if outType: + exe_string += ' %s more temp' % (separ) + latex_out = xpopen(exe_string,exe_string1,getStderr=outType) os.chdir(cur_directory); - if latex_out.find("Error")!=-1: + if (outType and latex_out.find("Error")!=-1): msg += ("PDF generation failed\n For a description of the problem see 'refman.log' in the latex directory of this test",) - failed_html=True + failed_latex=True + elif (not outType and xopen(latex_output + "/temp",'r').read().find("Error")!= -1): + msg += ("PDF generation failed\n For a description of the problem see 'refman.log' in the latex directory of this test",) + failed_latex=True elif xopen(latex_output + "/refman.log",'r').read().find("Error")!= -1: msg += ("PDF generation failed\n For a description of the problem see 'refman.log' in the latex directory of this test",) - failed_html=True + failed_latex=True elif xopen(latex_output + "/refman.log",'r').read().find("Emergency stop")!= -1: msg += ("PDF generation failed\n For a description of the problem see 'refman.log' in the latex directory of this test",) - failed_html=True + failed_latex=True elif not self.args.keep: shutil.rmtree(latex_output,ignore_errors=True) |