diff options
-rw-r--r-- | src/dot.cpp | 2 | ||||
-rw-r--r-- | src/plantuml.h | 1 | ||||
-rwxr-xr-x | testing/runtests.py | 3 |
3 files changed, 5 insertions, 1 deletions
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<engine>` */ void generatePlantUMLOutput(const QCString &baseName,const QCString &outDir,OutputFormat format); 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) |