Revision: 14723
Author: [email protected]
Date: Fri May 17 08:10:25 2013
Log: Allow for no samples in
test-cpu-profiler/SampleWhenFrameIsNotSetup
The test should only check that there are no sample stacks that never
possible in the JS code being profiled.
BUG=v8:2628
[email protected]
Review URL: https://codereview.chromium.org/14845018
http://code.google.com/p/v8/source/detail?r=14723
Modified:
/branches/bleeding_edge/test/cctest/cctest.status
/branches/bleeding_edge/test/cctest/test-cpu-profiler.cc
=======================================
--- /branches/bleeding_edge/test/cctest/cctest.status Wed May 15 03:54:24
2013
+++ /branches/bleeding_edge/test/cctest/cctest.status Fri May 17 08:10:25
2013
@@ -39,10 +39,6 @@
# when snapshot is on, so I am marking it PASS || FAIL
test-heap-profiler/HeapSnapshotsDiff: PASS || FAIL
-# BUG(2628): These tests are flaky and sometimes fail, but should not
crash.
-test-cpu-profiler/CollectCpuProfile: PASS || FAIL
-test-cpu-profiler/SampleWhenFrameIsNotSetup: PASS || FAIL
-
# These tests always fail. They are here to test test.py. If
# they don't fail then test.py has failed.
test-serialize/TestThatAlwaysFails: FAIL
@@ -87,7 +83,8 @@
# BUG(2628): Signal may come when pc is close to frame enter/exit code and
on
# simulator the stack frame is not set up when it is expected to be for
the pc
# value.
-test-cpu-profiler/SampleWhenFrameIsNotSetup: SKIP
+test-cpu-profiler/CollectCpuProfile: PASS || FAIL
+test-cpu-profiler/SampleWhenFrameIsNotSetup: PASS || FAIL
##############################################################################
[ $arch == android_arm || $arch == android_ia32 ]
=======================================
--- /branches/bleeding_edge/test/cctest/test-cpu-profiler.cc Tue May 14
15:51:33 2013
+++ /branches/bleeding_edge/test/cctest/test-cpu-profiler.cc Fri May 17
08:10:25 2013
@@ -608,7 +608,9 @@
CheckChildrenNames(root, names);
const v8::CpuProfileNode* startNode = FindChild(root, "start");
- if (startNode->GetChildrenCount() > 0) {
+ // On slow machines there may be no meaningfull samples at all, skip the
+ // check there.
+ if (startNode && startNode->GetChildrenCount() > 0) {
CHECK_EQ(1, startNode->GetChildrenCount());
const v8::CpuProfileNode* delayNode = FindChild(startNode, "delay");
if (delayNode->GetChildrenCount() > 0) {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
