Michael J Gruber venit, vidit, dixit 05.09.2011 11:23: > Junio C Hamano venit, vidit, dixit 05.09.2011 10:35: >> Hmm, with this whole series merged to 'pu', I somehow am getting this >> error: >> >> $ make -j8 \ >> DEFAULT_TEST_TARGET=prove \ >> GIT_PROVE_OPTS=-j8 \ >> T=t5541-http-push.sh test >> *** prove *** >> t5541-http-push.sh .. All 1 subtests passed >> >> Test Summary Report >> ------------------- >> t5541-http-push.sh (Wstat: 0 Tests: 1 Failed: 0) >> Parse errors: No plan found in TAP output >> Files=1, Tests=1, 0 wallclock secs ( 0.02 usr 0.00 sys + 0.06 cusr 0.01 csys = 0.09 CPU) >> Result: FAIL >> make[1]: *** [prove] Error 1 >> make[1]: Leaving directory `/srv/project/git/git.git/t' >> make: *** [test] Error 2 >> >> Without prove (drop "DEFAULT_TEST_TARGET=prove" from the command line), >> I do not see the breakage. >> >> *** t5541-http-push.sh *** >> ok 1 - set up terminal for tests >> # passed all 1 test(s) >> 1..1 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable) >> make aggregate-results >> make[3]: Entering directory `/srv/project/git/git.git/t' >> for f in test-results/t*-*.counts; do \ >> echo "$f"; \ >> done | '/bin/sh' ./aggregate-results.sh >> fixed 0 >> success 1 >> failed 0 >> broken 0 >> total 1 >> > > Being cc'ed makes me feel guilty but I don't know what for... Anyway, in > case you need more test points, with pu at v1.7.7-rc0-315-g55af6ac and > prove I get: > > *** prove *** > t5541-http-push.sh .. skipped: Network testing disabled (define > GIT_TEST_HTTPD to enable) > Files=1, Tests=0, 0 wallclock secs ( 0.04 usr 0.01 sys + 0.00 cusr > 0.02 csys = 0.07 CPU) > Result: NOTESTS > > Patch 3/3 does not apply (am) to pu but leaves neither changes nor > conflicts in my wt. -3 gives a conflict which I don't know how to > resolve without digging further, see below. > > Michael > > The conflict in send-pack.c is simple, but what about: ... OK, I resolved this now, and am getting the same error as you, and am stumped. But for me, 1/3 introduces that problem already. In fact, the hunk --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -5,6 +5,7 @@ test_description='test smart pushing over http via http-backend' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-terminal.sh suffices to trigger the problem. The test run in lib-terminal increases the count but the output is lost. Patch upcoming. Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html