After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 789649 - testsuite sync sanity.sh to devhelp2.gz fix - warnings restored adds to log lines count
testsuite sync sanity.sh to devhelp2.gz fix - warnings restored adds to log l...
Status: RESOLVED FIXED
Product: gtk-doc
Classification: Platform
Component: general
1.26
Other Linux
: Normal normal
: ---
Assigned To: gtk-doc maintainers
gtk-doc maintainers
Depends on:
Blocks:
 
 
Reported: 2017-10-30 12:09 UTC by Alban Browaeys
Modified: 2017-11-03 20:00 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
add 18 to expected_lines log lines count - account for restored warnings (622 bytes, patch)
2017-10-30 12:09 UTC, Alban Browaeys
none Details | Review
discard references to launchapd bug 1466210 (776 bytes, patch)
2017-11-01 22:19 UTC, Alban Browaeys
none Details | Review
git version - 362786: discard references to launchapd bug 1466210 (1.30 KB, patch)
2017-11-01 22:33 UTC, Alban Browaeys
committed Details | Review
tests: Fix sanity.sh lines count when devhelp2.gz warning is restored (1.33 KB, patch)
2017-11-03 19:54 UTC, Stefan Sauer (gstreamer, gtkdoc dev)
committed Details | Review

Description Alban Browaeys 2017-10-30 12:09:32 UTC
Created attachment 362543 [details] [review]
add 18 to expected_lines log lines count - account for restored warnings

sanity.sh expects only the command line as output in the logs (expected_lines=1). Add 18 to those numbers to account for restored devhelp2.gz warning.

This fix make check sanity.sh


"
  DOC   00:00:01.520218581: Building HTML
  DOC   00:00:02.563148504: Fixing cross-references
Please fix https://bugs.launchpad.net/ubuntu/+source/gtk-doc/+bug/1466210 . For now run:
gunzip /usr/share/gtk-doc/html/gespeaker/gespeaker.devhelp2.gz

Please fix https://bugs.launchpad.net/ubuntu/+source/gtk-doc/+bug/1466210 . For now run:
gunzip /usr/share/gtk-doc/html/ogmrip/ogmdvd/ogmdvd.devhelp2.gz

Please fix https://bugs.launchpad.net/ubuntu/+source/gtk-doc/+bug/1466210 . For now run:
gunzip /usr/share/gtk-doc/html/ogmrip/ogmdvd-gtk/ogmdvd-gtk.devhelp2.gz

Please fix https://bugs.launchpad.net/ubuntu/+source/gtk-doc/+bug/1466210 . For now run:
gunzip /usr/share/gtk-doc/html/ogmrip/ogmjob/ogmjob.devhelp2.gz

Please fix https://bugs.launchpad.net/ubuntu/+source/gtk-doc/+bug/1466210 . For now run:
gunzip /usr/share/gtk-doc/html/ogmrip/ogmrip/ogmrip.devhelp2.gz

Please fix https://bugs.launchpad.net/ubuntu/+source/gtk-doc/+bug/1466210 . For now run:
gunzip /usr/share/gtk-doc/html/ogmrip/ogmrip-gtk/ogmrip-gtk.devhelp2.gz

"
Comment 1 Stefan Sauer (gstreamer, gtkdoc dev) 2017-11-01 20:45:56 UTC
I think it would be better to suppress those by filtering them from the output files when counting lines. WDYT?
Comment 2 Alban Browaeys 2017-11-01 22:19:23 UTC
Created attachment 362786 [details] [review]
discard references to launchapd bug 1466210

grep basic regular expression. I do not escape the dots, that would be overkill.
Comment 3 Alban Browaeys 2017-11-01 22:33:43 UTC
Created attachment 362787 [details] [review]
git version - 362786: discard references to launchapd bug 1466210

Best to send the patch for git than old style. Here it is
Comment 4 Stefan Sauer (gstreamer, gtkdoc dev) 2017-11-03 19:54:32 UTC
The following fix has been pushed:
4e5429c tests: Fix sanity.sh lines count when devhelp2.gz warning is restored
Comment 5 Stefan Sauer (gstreamer, gtkdoc dev) 2017-11-03 19:54:40 UTC
Created attachment 362936 [details] [review]
tests: Fix sanity.sh lines count when devhelp2.gz warning is restored

Do so by discarding references to this warning.
Comment 6 Stefan Sauer (gstreamer, gtkdoc dev) 2017-11-03 20:00:26 UTC
I adjusted the regexp to match both messages. Thanks for the patch!