Revision: 15324
Author: [email protected]
Date: Tue Jun 25 07:32:21 2013
Log: Merged r15231 into 3.19 branch.
Skip parallel recompilation tests if parallel recompilation is disabled.
BUG=v8:2733
[email protected]
Review URL: https://codereview.chromium.org/17635009
http://code.google.com/p/v8/source/detail?r=15324
Modified:
/branches/3.19/src/version.cc
/branches/3.19/test/mjsunit/compiler/parallel-proto-change.js
/branches/3.19/test/mjsunit/manual-parallel-recompile.js
/branches/3.19/test/mjsunit/parallel-initial-prototype-change.js
/branches/3.19/test/mjsunit/parallel-invalidate-transition-map.js
/branches/3.19/test/mjsunit/parallel-optimize-disabled.js
=======================================
--- /branches/3.19/src/version.cc Tue Jun 25 01:38:29 2013
+++ /branches/3.19/src/version.cc Tue Jun 25 07:32:21 2013
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 19
#define BUILD_NUMBER 18
-#define PATCH_LEVEL 8
+#define PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.19/test/mjsunit/compiler/parallel-proto-change.js Wed Jun
12 15:31:22 2013
+++ /branches/3.19/test/mjsunit/compiler/parallel-proto-change.js Tue Jun
25 07:32:21 2013
@@ -28,6 +28,11 @@
// Flags: --allow-natives-syntax
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
=======================================
--- /branches/3.19/test/mjsunit/manual-parallel-recompile.js Tue Jun 18
04:54:54 2013
+++ /branches/3.19/test/mjsunit/manual-parallel-recompile.js Tue Jun 25
07:32:21 2013
@@ -28,6 +28,11 @@
// Flags: --allow-natives-syntax --expose-gc
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
@@ -60,10 +65,8 @@
%OptimizeFunctionOnNextCall(g, "parallel");
f(g(2)); // Trigger optimization.
-if (%IsParallelRecompilationSupported()) {
- assertUnoptimized(f); // Not yet optimized.
- assertUnoptimized(g);
-}
+assertUnoptimized(f); // Not yet optimized.
+assertUnoptimized(g);
%CompleteOptimization(f); // Wait till optimized code is installed.
%CompleteOptimization(g);
=======================================
--- /branches/3.19/test/mjsunit/parallel-initial-prototype-change.js Wed
Jun 12 15:31:22 2013
+++ /branches/3.19/test/mjsunit/parallel-initial-prototype-change.js Tue
Jun 25 07:32:21 2013
@@ -28,6 +28,11 @@
// Flags: --allow-natives-syntax
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
=======================================
--- /branches/3.19/test/mjsunit/parallel-invalidate-transition-map.js Wed
Jun 12 15:31:22 2013
+++ /branches/3.19/test/mjsunit/parallel-invalidate-transition-map.js Tue
Jun 25 07:32:21 2013
@@ -28,6 +28,11 @@
// Flags: --track-fields --track-double-fields --allow-natives-syntax
// Flags: --parallel-recompilation --parallel-recompilation-delay=50
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function assertUnoptimized(fun) {
assertTrue(%GetOptimizationStatus(fun) != 1);
}
=======================================
--- /branches/3.19/test/mjsunit/parallel-optimize-disabled.js Wed Jun 12
15:31:22 2013
+++ /branches/3.19/test/mjsunit/parallel-optimize-disabled.js Tue Jun 25
07:32:21 2013
@@ -28,6 +28,11 @@
// Flags: --nodead-code-elimination --parallel-recompilation
// Flags: --allow-natives-syntax
+if (!%IsParallelRecompilationSupported()) {
+ print("Parallel recompilation is disabled. Skipping this test.");
+ quit();
+}
+
function g() { // g() cannot be optimized.
const x = 1;
x++;
--
--
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.
