Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master

List for cgit developers and users
 help / color / mirror / Atom feed

* Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8
       [not found] <636854575.8.1439391876094.JavaMail.jenkins@jenkins-public.internal.hupie.com>
@ 2015-08-12 15:23 ` mailings
  2015-08-12 15:41   ` john
  0 siblings, 1 reply; 3+ messages in thread
From: mailings @ 2015-08-12 15:23 UTC (permalink / raw)





-------- Forwarded Message --------
Subject: 	Build failed in Jenkins: cgit - upstream - master #206 - 
remotes/origin/master - 30304d8
Date: 	Wed, 12 Aug 2015 17:04:36 +0200 (CEST)
From: 	Pelagic Jenkins (Public) <noreply at jenkins-public.pelagic.nl>
To: 	ferry.huberts at pelagic.nl



See <https://hupie.dyndns.org:15051/jenkins/job/cgit%20-%20upstream%20-%20master/206/changes>

Changes:

[Jason at zx2c4.com] shared: make cgit_diff_tree_cb public

[Jason at zx2c4.com] log: allow users to follow a file

------------------------------------------
[...truncated 517 lines...]
     MSGFMT    po/hu.msg 514 translated.
     MSGFMT    po/vi.msg 543 translated.
     MSGFMT    po/ru.msg 516 translated, 4 untranslated.
     MSGFMT    po/bg.msg 547 translated.
     MSGFMT    po/nb.msg 474 translated, 39 untranslated.
     MSGFMT    po/sv.msg 547 translated.
     MSGFMT    po/fr.msg 520 translated.
     MSGFMT    po/it.msg 519 translated, 1 untranslated.
     MSGFMT    po/ja.msg 520 translated.
     MSGFMT po/pt_br.msg 520 translated.
     MSGFMT    po/de.msg 520 translated.
     MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.
     MSGFMT    po/el.msg 381 translated, 4 fuzzy, 6 untranslated.
     SUBDIR gitk-git
     * new Tcl/Tk interpreter location
     GEN gitk-wish
Generating catalog po/hu.msg
msgfmt --statistics --tcl po/hu.po -l hu -d po/
277 translated messages, 17 fuzzy translations, 10 untranslated messages.
Generating catalog po/vi.msg
msgfmt --statistics --tcl po/vi.po -l vi -d po/
301 translated messages, 2 fuzzy translations, 1 untranslated message.
Generating catalog po/ca.msg
msgfmt --statistics --tcl po/ca.po -l ca -d po/
303 translated messages, 1 fuzzy translation.
Generating catalog po/ru.msg
msgfmt --statistics --tcl po/ru.po -l ru -d po/
225 translated messages, 33 fuzzy translations, 46 untranslated messages.
Generating catalog po/bg.msg
msgfmt --statistics --tcl po/bg.po -l bg -d po/
302 translated messages, 1 fuzzy translation, 1 untranslated message.
Generating catalog po/es.msg
msgfmt --statistics --tcl po/es.po -l es -d po/
183 translated messages, 45 fuzzy translations, 76 untranslated messages.
Generating catalog po/sv.msg
msgfmt --statistics --tcl po/sv.po -l sv -d po/
301 translated messages, 2 fuzzy translations, 1 untranslated message.
Generating catalog po/fr.msg
msgfmt --statistics --tcl po/fr.po -l fr -d po/
262 translated messages, 26 fuzzy translations, 16 untranslated messages.
Generating catalog po/it.msg
msgfmt --statistics --tcl po/it.po -l it -d po/
274 translated messages, 16 fuzzy translations, 14 untranslated messages.
Generating catalog po/ja.msg
msgfmt --statistics --tcl po/ja.po -l ja -d po/
272 translated messages, 19 fuzzy translations, 13 untranslated messages.
Generating catalog po/pt_br.msg
msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/
280 translated messages, 15 fuzzy translations, 9 untranslated messages.
Generating catalog po/de.msg
msgfmt --statistics --tcl po/de.po -l de -d po/
279 translated messages, 16 fuzzy translations, 9 untranslated messages.
     SUBDIR perl
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/GlobSpec.pm >blib/lib/Git/SVN/GlobSpec.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Migration.pm >blib/lib/Git/SVN/Migration.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Memoize/YAML.pm >blib/lib/Git/SVN/Memoize/YAML.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git.pm >blib/lib/Git.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Utils.pm >blib/lib/Git/SVN/Utils.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Ra.pm >blib/lib/Git/SVN/Ra.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Editor.pm >blib/lib/Git/SVN/Editor.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/I18N.pm >blib/lib/Git/I18N.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/IndexInfo.pm >blib/lib/Git/IndexInfo.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Prompt.pm >blib/lib/Git/SVN/Prompt.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Log.pm >blib/lib/Git/SVN/Log.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN/Fetcher.pm >blib/lib/Git/SVN/Fetcher.pm
"/usr/bin/perl" -pe "s<\Q++LOCALEDIR++\E></var/lib/jenkins/share/locale>" <Git/SVN.pm >blib/lib/Git/SVN.pm
Manifying 8 pod documents
     SUBDIR templates
     MSGFMT po/build/locale/pt_PT/LC_MESSAGES/git.mo
306 translated messages, 687 untranslated messages.
     MSGFMT po/build/locale/bg/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/vi/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/is/LC_MESSAGES/git.mo
14 translated messages.
     MSGFMT po/build/locale/ca/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/ru/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/sv/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/fr/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/it/LC_MESSAGES/git.mo
716 translated messages, 350 untranslated messages.
     MSGFMT po/build/locale/de/LC_MESSAGES/git.mo
2359 translated messages.
     MSGFMT po/build/locale/zh_CN/LC_MESSAGES/git.mo
2359 translated messages.
     CC test-chmtime.o
     LINK test-chmtime
     CC test-ctype.o
     LINK test-ctype
     CC test-config.o
     LINK test-config
     CC test-date.o
     LINK test-date
     CC test-delta.o
     LINK test-delta
     CC test-dump-cache-tree.o
     LINK test-dump-cache-tree
     CC test-dump-split-index.o
     LINK test-dump-split-index
     CC test-dump-untracked-cache.o
     LINK test-dump-untracked-cache
     CC test-genrandom.o
     LINK test-genrandom
     CC test-hashmap.o
     LINK test-hashmap
     CC test-index-version.o
     LINK test-index-version
     CC test-line-buffer.o
     LINK test-line-buffer
     CC test-match-trees.o
     LINK test-match-trees
     CC test-mergesort.o
     LINK test-mergesort
     CC test-mktemp.o
     LINK test-mktemp
     CC test-parse-options.o
     LINK test-parse-options
     CC test-path-utils.o
     LINK test-path-utils
     CC test-prio-queue.o
     LINK test-prio-queue
     CC test-read-cache.o
     LINK test-read-cache
     CC test-regex.o
     LINK test-regex
     CC test-revision-walking.o
     LINK test-revision-walking
     CC test-run-command.o
     LINK test-run-command
     CC test-scrap-cache-tree.o
     LINK test-scrap-cache-tree
     CC test-sha1.o
     LINK test-sha1
     CC test-sha1-array.o
     LINK test-sha1-array
     CC test-sigchain.o
     LINK test-sigchain
     CC test-string-list.o
     LINK test-string-list
     CC test-subprocess.o
     LINK test-subprocess
     CC test-svn-fe.o
     LINK test-svn-fe
     CC test-urlmatch-normalization.o
     LINK test-urlmatch-normalization
     CC test-wildmatch.o
     LINK test-wildmatch
     GEN bin-wrappers/git
     GEN bin-wrappers/git-upload-pack
     GEN bin-wrappers/git-receive-pack
     GEN bin-wrappers/git-upload-archive
     GEN bin-wrappers/git-shell
     GEN bin-wrappers/git-cvsserver
     GEN bin-wrappers/test-chmtime
     GEN bin-wrappers/test-ctype
     GEN bin-wrappers/test-config
     GEN bin-wrappers/test-date
     GEN bin-wrappers/test-delta
     GEN bin-wrappers/test-dump-cache-tree
     GEN bin-wrappers/test-dump-split-index
     GEN bin-wrappers/test-dump-untracked-cache
     GEN bin-wrappers/test-genrandom
     GEN bin-wrappers/test-hashmap
     GEN bin-wrappers/test-index-version
     GEN bin-wrappers/test-line-buffer
     GEN bin-wrappers/test-match-trees
     GEN bin-wrappers/test-mergesort
     GEN bin-wrappers/test-mktemp
     GEN bin-wrappers/test-parse-options
     GEN bin-wrappers/test-path-utils
     GEN bin-wrappers/test-prio-queue
     GEN bin-wrappers/test-read-cache
     GEN bin-wrappers/test-regex
     GEN bin-wrappers/test-revision-walking
     GEN bin-wrappers/test-run-command
     GEN bin-wrappers/test-scrap-cache-tree
     GEN bin-wrappers/test-sha1
     GEN bin-wrappers/test-sha1-array
     GEN bin-wrappers/test-sigchain
     GEN bin-wrappers/test-string-list
     GEN bin-wrappers/test-subprocess
     GEN bin-wrappers/test-svn-fe
     GEN bin-wrappers/test-urlmatch-normalization
     GEN bin-wrappers/test-wildmatch
     GEN git-remote-testgit
     SUBDIR tests
ok 1 - get foo/snapshot/master.tar.gz
ok 2 - check html headers
ok 3 - strip off the header lines
ok 4 - verify gzip format
ok 5 - untar
ok 6 - count files
ok 7 - verify untarred file-5
ok 8 - get foo/snapshot/master.zip
ok 9 - check HTML headers (zip)
ok 10 - strip off the header lines (zip)
ok 11 - verify zip format
ok 12 - unzip
ok 13 - count files (zip)
ok 14 - verify unzipped file-5
# passed all 14 test(s)
1..14
ok 1 - generate bar/tree
ok 2 - find file-1
ok 3 - find file-50
ok 4 - generate bar/tree/file-50
ok 5 - find line 1
ok 6 - no line 2
ok 7 - generate foo+bar/tree
ok 8 - verify a+b link
ok 9 - generate foo+bar/tree?h=1+2
ok 10 - verify a+b?h=1+2 link
# passed all 10 test(s)
1..10
ok 1 - generate foo/diff
ok 2 - find diff header
ok 3 - find blob link
ok 4 - find added file
ok 5 - find hunk header
ok 6 - find added line
# passed all 6 test(s)
1..6
ok 1 - generate foo/log
ok 2 - find commit 1
ok 3 - find commit 5
ok 4 - generate bar/log
not ok 5 - find commit 1
#	grep "commit 1" tmp
ok 6 - find commit 50
ok 7 - generate "with%20space/log?qt=grep&q=commit+1"
ok 8 - find commit 1
ok 9 - find link with %20 in path
ok 10 - find link with + in arg
ok 11 - no links with space in path
ok 12 - no links with space in arg
ok 13 - commit 2 is not visible
# failed 1 among 13 test(s)
1..13
Makefile:8: recipe for target 't0103-log.sh' failed
make[1]: *** [t0103-log.sh] Error 1
Makefile:75: recipe for target 'test' failed
make: *** [test] Error 2
Build step 'Execute shell' marked build as failure
Archiving artifacts



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20150812/f622ac0d/attachment.html>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8
  2015-08-12 15:23 ` Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8 mailings
@ 2015-08-12 15:41   ` john
  2015-08-12 15:43     ` Jason
  0 siblings, 1 reply; 3+ messages in thread
From: john @ 2015-08-12 15:41 UTC (permalink / raw)


On Wed, Aug 12, 2015 at 05:23:44PM +0200, Ferry Huberts wrote:
> Makefile:8: recipe for target 't0103-log.sh' failed
> make[1]: *** [t0103-log.sh] Error 1
> Makefile:75: recipe for target 'test' failed
> make: *** [test] Error 2
> Build step 'Execute shell' marked build as failure
> Archiving artifacts

I was a bit too quick with rebasing the log-follow topic onto the
updated master and ended up with some double counting (thus halving the
number of log entries that get shown).  This fixes it:

-- >8 --
Subject: [PATCH] ui-log: fix double counting

This crept in while rebasing the previous commit onto an updated
upstream.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-log.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-log.c b/ui-log.c
index ff832ce..6bff948 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -476,7 +476,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	if (ofs<0)
 		ofs = 0;
 
-	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
+	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
 		if (show_commit(commit, &rev))
 			i++;
 		free_commit_buffer(commit);
@@ -484,7 +484,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		commit->parents = NULL;
 	}
 
-	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
+	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; /* nop */) {
 		/*
 		 * In "follow" mode, we must count the files and lines the
 		 * first time we invoke diff on a given commit, and we need
-- 
2.5.0.466.g9af26fa



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8
  2015-08-12 15:41   ` john
@ 2015-08-12 15:43     ` Jason
  0 siblings, 0 replies; 3+ messages in thread
From: Jason @ 2015-08-12 15:43 UTC (permalink / raw)


Thanks, applied.


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-08-12 15:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <636854575.8.1439391876094.JavaMail.jenkins@jenkins-public.internal.hupie.com>
2015-08-12 15:23 ` Fwd: Build failed in Jenkins: cgit - upstream - master #206 - remotes/origin/master - 30304d8 mailings
2015-08-12 15:41   ` john
2015-08-12 15:43     ` Jason

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).