AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix api tests based on incorrect assumptions about GC behavior.

Browse Source 
Review URL: http://codereview.chromium.org/1701018

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4529 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
vegorov@chromium.org 2010-04-28 11:02:26 +00:00
parent 9223815b6e
commit 8c8b7f893d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/cctest/test-api.cc
View File

@ -569,6 +569,7 @@ THREADED_TEST(UsingExternalAsciiString) {
THREADED_TEST(ScavengeExternalString) { THREADED_TEST(ScavengeExternalString) {
TestResource::dispose_count = 0; TestResource::dispose_count = 0;
bool in_new_space = false;
{ {
v8::HandleScope scope; v8::HandleScope scope;
uint16_t* two_byte_string = AsciiToTwoByteString("test string"); uint16_t* two_byte_string = AsciiToTwoByteString("test string");
@ -576,16 +577,18 @@ THREADED_TEST(ScavengeExternalString) {
String::NewExternal(new TestResource(two_byte_string)); String::NewExternal(new TestResource(two_byte_string));
i::Handle<i::String> istring = v8::Utils::OpenHandle(*string); i::Handle<i::String> istring = v8::Utils::OpenHandle(*string);
i::Heap::CollectGarbage(0, i::NEW_SPACE); i::Heap::CollectGarbage(0, i::NEW_SPACE);
CHECK(i::Heap::InNewSpace(*istring)); in_new_space = i::Heap::InNewSpace(*istring);
CHECK(in_new_space || i::Heap::old_data_space()->Contains(*istring));
CHECK_EQ(0, TestResource::dispose_count); CHECK_EQ(0, TestResource::dispose_count);
} }
i::Heap::CollectGarbage(0, i::NEW_SPACE); i::Heap::CollectGarbage(0, in_new_space ? i::NEW_SPACE : i::OLD_DATA_SPACE);
CHECK_EQ(1, TestResource::dispose_count); CHECK_EQ(1, TestResource::dispose_count);
} }
THREADED_TEST(ScavengeExternalAsciiString) { THREADED_TEST(ScavengeExternalAsciiString) {
TestAsciiResource::dispose_count = 0; TestAsciiResource::dispose_count = 0;
bool in_new_space = false;
{ {
v8::HandleScope scope; v8::HandleScope scope;
const char* one_byte_string = "test string"; const char* one_byte_string = "test string";
@ -593,10 +596,11 @@ THREADED_TEST(ScavengeExternalAsciiString) {
new TestAsciiResource(i::StrDup(one_byte_string))); new TestAsciiResource(i::StrDup(one_byte_string)));
i::Handle<i::String> istring = v8::Utils::OpenHandle(*string); i::Handle<i::String> istring = v8::Utils::OpenHandle(*string);
i::Heap::CollectGarbage(0, i::NEW_SPACE); i::Heap::CollectGarbage(0, i::NEW_SPACE);
CHECK(i::Heap::InNewSpace(*istring)); in_new_space = i::Heap::InNewSpace(*istring);
CHECK(in_new_space || i::Heap::old_data_space()->Contains(*istring));
CHECK_EQ(0, TestAsciiResource::dispose_count); CHECK_EQ(0, TestAsciiResource::dispose_count);
} }
i::Heap::CollectGarbage(0, i::NEW_SPACE); i::Heap::CollectGarbage(0, in_new_space ? i::NEW_SPACE : i::OLD_DATA_SPACE);
CHECK_EQ(1, TestAsciiResource::dispose_count); CHECK_EQ(1, TestAsciiResource::dispose_count);
} }