On Tue, Mar 17, 2009 at 4:45 AM, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>> -----Original Message-----
>> From: Paul T. Burba [mailto:pburba_at_collab.net]
>> Sent: Tuesday, March 17, 2009 1:23 AM
>> To: svn_at_subversion.tigris.org
>> Subject: svn commit: r36613 - trunk/subversion/libsvn_client
>>
>> Author: pburba
>> Date: Mon Mar 16 17:22:43 2009
>> New Revision: 36613
>>
>> Log:
>> Avoid potential segfaults caused by NULL elements in the
>> CHILDREN_WITH_MERGEINFO array by removing elements rather than setting
>> them
>> to NULL.
>
> Hi,
>
> It looks like this test generates the following failure on neon (and
> probably serf):
> FAIL: merge_authz_tests.py 1: skipped paths get overriding mergeinfo
>
> (From
> http://crest.ics.uci.edu/buildbot/builders/x86-macosx-gnu%20shared/builds/17
> 8/steps/Test%20fsfs%2Bra_neon/logs/testlog/text):
>
> CMD: svn proplist --verbose
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/C
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/H/ome
> ga svn-test-
> work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/H
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B/E/bet
> a svn-test-work/working_copies/merge_authz_test
> s-1.restricted/A_COPY_2/mu
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/gamma
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B/E/alp
> ha
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/H/ch
> i
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B/lambd
> a svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B/E
> svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B/F
> svn-test-work/working_copies/mer
> ge_authz_tests-1.restricted/A_COPY_2 --config-dir
> /Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/svn
> -test-work/local_tmp/config --password rayjandom --no-auth-cache --username
> jrandom <TIME = 0.086657>
> Properties on
> 'svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/H/om
> ega':
> svn:mergeinfo
> /A/D/H/omega:5-8
> Properties on
> 'svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D':
> svn:mergeinfo
> /A/D:5-8*
> Properties on
> 'svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/H':
> svn:mergeinfo
> /A/D/H:5-8*
> Properties on
> 'svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/D/H/ch
> i':
> svn:mergeinfo
> /A/D/H/chi:5-8
> Properties on
> 'svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2/B/E':
> svn:mergeinfo
>
> Properties on
> 'svn-test-work/working_copies/merge_authz_tests-1.restricted/A_COPY_2':
> svn:mergeinfo
> /A:5-8
> =============================================================
> Expected 'gamma' and actual 'gamma' in disk tree are different!
> =============================================================
> EXPECTED NODE TO BE:
> =============================================================
> * Node name: gamma
> Path: __SVN_ROOT_NODE/D/gamma
> Contents: This is the file 'gamma'.
>
> Properties: {'svn:mergeinfo': '/A/D/gamma:5-8'}
> Attributes: {}
> Children: None (node is probably a file)
> =============================================================
> ACTUAL NODE FOUND:
> =============================================================
> * Node name: gamma
> Path: __SVN_ROOT_NODE/D/gamma
> Contents: This is the file 'gamma'.
>
> Properties: {}
> Attributes: {}
> Children: None (node is probably a file)
> Unequal at node gamma
> Unequal at node D
> ACTUAL DISK TREE:
> svntest.wc.State('', {
> 'C' : Item(),
> 'B' : Item(),
> 'B/E' : Item(props={'svn:mergeinfo':''}),
> 'B/E/beta' : Item(contents="This is the file 'beta'.\n"),
> 'B/E/alpha' : Item(contents="This is the file 'alpha'.\n"),
> 'B/lambda' : Item(contents="This is the file 'lambda'.\n"),
> 'B/F' : Item(),
> 'D' : Item(props={'svn:mergeinfo':'/A/D:5-8*'}),
> 'D/H' : Item(props={'svn:mergeinfo':'/A/D/H:5-8*'}),
> 'D/H/omega' : Item(contents="New content",
> props={'svn:mergeinfo':'/A/D/H/omega:5-8'}),
> 'D/H/chi' : Item(contents="This is the file 'chi'.\n",
> props={'svn:mergeinfo':'/A/D/H/chi:5-8'}),
> 'D/gamma' : Item(contents="This is the file 'gamma'.\n"),
> 'mu' : Item(contents="This is the file 'mu'.\n"),
> '.' : Item(props={'svn:mergeinfo':'/A:5-8'}),
> })
> EXCEPTION: SVNTreeUnequal
> Traceback (most recent call last):
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/main.py", line 1120, in run
> rc = self.pred.run(sandbox)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/testcase.py", line 185, in run
> return self._delegate.run(sandbox)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/testcase.py", line 185, in run
> return self._delegate.run(sandbox)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/testcase.py", line 114, in run
> return self.func(sandbox)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/me
> rge_authz_tests.py", line 260, in mergeinfo_and_skipped_paths
> None, 1, 0)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/actions.py", line 788, in run_and_verify_merge
> b_baton, check_props, dry_run)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/actions.py", line 916, in run_and_verify_merge2
> check_props)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/actions.py", line 615, in verify_update
> singleton_handler_b, b_baton)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/tree.py", line 626, in compare_trees
> singleton_handler_b, b_baton)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/tree.py", line 626, in compare_trees
> singleton_handler_b, b_baton)
> File
> "/Users/lgo/slavedir/osx10.4-gcc4.0.1-ia32/build/subversion/tests/cmdline/sv
> ntest/tree.py", line 601, in compare_trees
> raise SVNTreeUnequal
> SVNTreeUnequal
> FAIL: merge_authz_tests.py 1: skipped paths get overriding mergeinfo
Bert,
Yeah, that was due to some stupidity on my part. Fixed in r33631.
That will teach me to run the tests over [ra_svn | ra_neon | ra_serf]
when making merge related changes (merge_authz_tests.py doesn't run
over ra_local).
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1342388
Received on 2009-03-17 18:23:37 CET