trying to fix unittests under tsan v2

git-svn-id: http://data-race-test.googlecode.com/svn/trunk@4429 93a3164d-3a44-0410-8ae5-4baa038b0729