Revert of CpuProfiler: enable tests except four failing tests. (patchset #3 id:100001 of https://codereview.chromium.org/976203003/)

Reason for revert:
Some tests still flaky

Original issue's description:
> CpuProfiler: enable tests except four failing tests.
>
> Four tests are failing due to a problem with no frame ranges.
>
> BUG=
> LOG=n
>
> Committed: https://crrev.com/2be160e726f2be6272b77e53fbd556aded6024f1
> Cr-Commit-Position: refs/heads/master@{#27035}

TBR=yurys@chromium.org,svenpanne@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/987553005

Cr-Commit-Position: refs/heads/master@{#27037}
This commit is contained in:
loislo 2015-03-06 02:19:51 -08:00 committed by Commit bot
parent e6ff16d6bf
commit b2ae7a7594
2 changed files with 19 additions and 30 deletions

View File

@ -71,11 +71,8 @@
# The cpu profiler tests are notoriously flaky.
# BUG(2999). (test/cpu-profiler/CollectCpuProfile)
# BUG(3287). (test-cpu-profiler/SampleWhenFrameIsNotSetup)
'test-cpu-profiler/CollectCpuProfile': [SKIP],
'test-cpu-profiler/CollectCpuProfileSamples': [SKIP],
'test-cpu-profiler/FunctionApplySample': [SKIP],
'test-cpu-profiler/FunctionCallSample': [SKIP],
'test-cpu-profiler/SampleWhenFrameIsNotSetup': [SKIP],
'test-cpu-profiler/*': [PASS, FLAKY],
'test-cpu-profiler/*': [SKIP],
# BUG(3525). Test crashes flakily.
'test-debug/RecursiveBreakpoints': [PASS, FLAKY],
@ -116,14 +113,15 @@
##############################################################################
['arch == arm64', {
'test-cpu-profiler/CollectDeoptEvents': [PASS, FAIL],
'test-api/Bug618': [PASS],
# BUG(v8:3385).
'test-serialize/DeserializeFromSecondSerialization': [PASS, FAIL],
'test-serialize/DeserializeFromSecondSerializationAndRunScript2': [PASS, FAIL],
# BUG(v8:2999).
'test-cpu-profiler/CollectCpuProfile': [PASS, FAIL],
# BUG(v8:3154).
'test-heap/ReleaseOverReservedPages': [PASS, FAIL],
@ -181,12 +179,18 @@
##############################################################################
['system == windows', {
# BUG(2999).
'test-cpu-profiler/CollectCpuProfile': [PASS, FAIL],
# BUG(3005).
'test-alloc/CodeRange': [PASS, FAIL],
# BUG(3331). Fails on windows.
'test-heap/NoWeakHashTableLeakWithIncrementalMarking': [SKIP],
# BUG(v8:3433). Crashes on windows.
'test-cpu-profiler/FunctionApplySample': [SKIP],
}], # 'system == windows'
##############################################################################
@ -201,8 +205,6 @@
##############################################################################
['arch == arm', {
'test-cpu-profiler/CollectDeoptEvents': [PASS, FAIL],
# BUG(355): Test crashes on ARM.
'test-log/ProfLazyMode': [SKIP],

View File

@ -438,7 +438,8 @@ static v8::CpuProfile* RunProfiler(
static bool ContainsString(v8::Handle<v8::String> string,
const Vector<v8::Handle<v8::String> >& vector) {
for (int i = 0; i < vector.length(); i++) {
if (string->Equals(vector[i])) return true;
if (string->Equals(vector[i]))
return true;
}
return false;
}
@ -449,25 +450,11 @@ static void CheckChildrenNames(const v8::CpuProfileNode* node,
int count = node->GetChildrenCount();
for (int i = 0; i < count; i++) {
v8::Handle<v8::String> name = node->GetChild(i)->GetFunctionName();
if (!ContainsString(name, names)) {
char buffer[100];
i::SNPrintF(Vector<char>(buffer, arraysize(buffer)),
"Unexpected child '%s' found in '%s'",
*v8::String::Utf8Value(name),
*v8::String::Utf8Value(node->GetFunctionName()));
FATAL(buffer);
}
CHECK(ContainsString(name, names));
// Check that there are no duplicates.
for (int j = 0; j < count; j++) {
if (j == i) continue;
if (name->Equals(node->GetChild(j)->GetFunctionName())) {
char buffer[100];
i::SNPrintF(Vector<char>(buffer, arraysize(buffer)),
"Second child with the same name '%s' found in '%s'",
*v8::String::Utf8Value(name),
*v8::String::Utf8Value(node->GetFunctionName()));
FATAL(buffer);
}
CHECK(!name->Equals(node->GetChild(j)->GetFunctionName()));
}
}
}
@ -1087,10 +1074,10 @@ TEST(TickLines) {
CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate->heap());
profiles->StartProfiling("", false);
ProfileGenerator generator(profiles);
SmartPointer<ProfilerEventsProcessor> processor(new ProfilerEventsProcessor(
&generator, NULL, v8::base::TimeDelta::FromMicroseconds(100)));
ProfilerEventsProcessor* processor = new ProfilerEventsProcessor(
&generator, NULL, v8::base::TimeDelta::FromMicroseconds(100));
processor->Start();
CpuProfiler profiler(isolate, profiles, &generator, processor.get());
CpuProfiler profiler(isolate, profiles, &generator, processor);
// Enqueue code creation events.
i::Handle<i::String> str = factory->NewStringFromAsciiChecked(func_name);
@ -1100,7 +1087,7 @@ TEST(TickLines) {
*str, line, column);
// Enqueue a tick event to enable code events processing.
EnqueueTickSampleEvent(processor.get(), code_address);
EnqueueTickSampleEvent(processor, code_address);
processor->StopSynchronously();