From c67c21597eb1e9e41cfa6e535a3779e815df09e1 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 31 May 2021 18:57:25 +0200 Subject: Correcting documentation warnings of doxygens own internal documentation --- src/dot.cpp | 2 ++ src/plantuml.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dot.cpp b/src/dot.cpp index b3fb678..5d6aa27 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -319,6 +319,8 @@ void writeDotGraphFromFile(const QCString &inFile,const QCString &outDir, * \param baseName the base name of the output files * \param context the scope in which this graph is found (for resolving links) * \param graphId a unique id for this graph, use for dynamic sections + * \param srcFile the source file + * \param srcLine the line number in the source file */ void writeDotImageMapFromFile(TextStream &t, const QCString &inFile, const QCString &outDir, diff --git a/src/plantuml.h b/src/plantuml.h index 83f1299..2b7a7bf 100644 --- a/src/plantuml.h +++ b/src/plantuml.h @@ -68,7 +68,6 @@ class PlantumlManager * @param[in] baseName the name of the generated file (as returned by writePlantUMLSource()) * @param[in] outDir the directory to write the resulting image into. * @param[in] format the image format to generate. - * @param[in] engine the plantuml engine to be used so the start command will be `@start` */ void generatePlantUMLOutput(const QCString &baseName,const QCString &outDir,OutputFormat format); -- cgit v0.12 From 26edad9186f1044a6d657fbc58cf0370cfcbb407 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 5 Jun 2021 18:18:04 +0200 Subject: Running tests with subdirs enabled When running the standard doxygen tests with subdirs enabled (i.e. on windows `nmake tests TESTS_FLAGS==--subdirs`) we get the following type errors: ``` Failed to run xmllint on the doxygen output file ..../testing/test_output_008 ``` this is due to the fact that the file to be checked is in a subdirectory and as directory separator a backslash is used (initially there are 2 backslashes but due to e.g. `check_file = check_file[0]` one backslash disappears. Furthermore everywhere else the backslashes are converted to forward slashes. In the resulting files there are references to the mentioned sub directories path, but the file to compare to is without therse so we have to filter them as well. --- testing/runtests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/runtests.py b/testing/runtests.py index 236a1c3..377a56b 100755 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -257,6 +257,7 @@ class Tester: else: check_file = check_file[0] # convert output to canonical form + check_file = check_file.replace('\\','/') data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)) if data: # strip version @@ -264,6 +265,8 @@ class Tester: else: msg += ('Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out),) break + if self.args.subdirs: + data = re.sub('d[0-9a-f]/d[0-9a-f][0-9a-f]/','',data) out_file='%s/%s' % (self.test_out,check) with xopen(out_file,'w') as f: print(data,file=f) -- cgit v0.12