fix test

qgis · May 28, 2018 · 6772f0d · 6772f0d
1 parent 83be4fa
commit 6772f0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/code_layout/sipifyheader.h b/tests/code_layout/sipifyheader.h
@@ -90,8 +90,8 @@ typedef QVector<QVariant> QgsSuperClass;
  * Documentation goes here
  *
  * Here's some comment mentioning another class QgsAutoAwesomemater::makeAwesome.
- * \since QGIS 3.0
  * \note some other note
+ * \since QGIS 3.0
  */
 class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBaseClass
 {

diff --git a/tests/code_layout/test_doxygen_layout.sh b/tests/code_layout/test_doxygen_layout.sh
@@ -9,11 +9,11 @@ if [[ ! -z $output ]]; then
 fi
 
 # check that \since and \deprecated are placed at the end of the command block
-output=$(unbuffer  ag --noaffinity --file-search-regex '\.h$' --multiline '(\\(deprecated|since)[^\n]+\n)+\s*\*[^\/]' ${TRAVIS_BUILD_DIR} | tee /dev/stderr)
+output=$(unbuffer  ag --noaffinity --file-search-regex '\.h$' --multiline '(\\(deprecated|since)[^\n]+\n)+\s*\*[^\/](?!\s*\\(deprecated|since))' ${TRAVIS_BUILD_DIR} | tee /dev/stderr)
 if [[ ! -z $output ]]; then
-  echo -e "\n\x1B[31m*** Docstring computation: \\\deprecated and \\\since should e placed at the end of command locks\x1B[0m"
-  echo -e "To fix it, you may want to run at the top level directory:"
-  echo 'sed -i -r '"'"'$!N;s/^(\s*\*\s+\\(deprecated|since)[^\n]+)\n(\s*\*[^\/].*)/\3\n\1/;P;D'"'"' $(ag -c --noaffinity --file-search-regex '"'"'\.h$'"'"' --multiline '"'"'(\\(deprecated|since)[^\n]+\n)+\s*\*[^\/]'"'"' . | cut -d: -f1)'
+  echo -e "\n\x1B[31m*** Docstring computation: \\\deprecated and \\\since should be placed at the end of command blocks\x1B[0m"
+  echo -e "To fix it, you may want to run (multiple times) at the top level directory:"
+  echo 'sed -i -r '"'"'$!N;s/^(\s*\*\s+\\(deprecated|since)[^\n]+)\n(\s*\*([^\/].*|$))/\3\n\1/;P;D'"'"' $(ag -c --noaffinity --file-search-regex '"'"'\.h$'"'"' --multiline '"'"'(\\(deprecated|since)[^\n]+\n)+\s*\*[^\/]'"'"' . | cut -d: -f1)'
   exit 1
 fi