Fix test failures after r23492.

R=vogelheim@chromium.org
TEST=cctest/test-run-properties/TypedArrayLoad

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23498 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index fea4b3b..f2bb922 100644 (file)
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -255,9 +255,6 @@
   # BUG(v8:3433). Crashes on windows.
   'test-cpu-profiler/FunctionApplySample': [SKIP],
 
-  # TODO(mstarzinger): Investigate and fix.
-  'test-run-properties/TypedArrayLoad': [SKIP],
-
 }],  # 'system == windows'
 
 ##############################################################################

diff --git a/test/cctest/compiler/test-run-properties.cc b/test/cctest/compiler/test-run-properties.cc
index c6d8dc8..72816da 100644 (file)
--- a/test/cctest/compiler/test-run-properties.cc
+++ b/test/cctest/compiler/test-run-properties.cc
@@ -29,10 +29,10 @@ static void TypedArrayLoadHelper(const char* array_type) {
   // - IsExternalArrayElementsKind(y)
   const char* source =
       "(function(a) {"
-      "  var x = (a = new %1$sArray(%2$d)); %3$s;"
-      "  var y = (a = new %1$sArray(%2$d)); %3$s; %%TypedArrayGetBuffer(y);"
-      "  if (!%%HasFixed%1$sElements(x)) %%AbortJS('x');"
-      "  if (!%%HasExternal%1$sElements(y)) %%AbortJS('y');"
+      "  var x = (a = new %sArray(%d)); %s;"
+      "  var y = (a = new %sArray(%d)); %s; %%TypedArrayGetBuffer(y);"
+      "  if (!%%HasFixed%sElements(x)) %%AbortJS('x');"
+      "  if (!%%HasExternal%sElements(y)) %%AbortJS('y');"
       "  function f(a,b) {"
       "    a = a | 0; b = b | 0;"
       "    return x[a] + y[b];"
@@ -40,7 +40,8 @@ static void TypedArrayLoadHelper(const char* array_type) {
       "  return f;"
       "})()";
   EmbeddedVector<char, 1024> source_buffer;
-  SNPrintF(source_buffer, source, array_type, size, values_buffer.start());
+  SNPrintF(source_buffer, source, array_type, size, values_buffer.start(),
+           array_type, size, values_buffer.start(), array_type, array_type);
 
   FunctionTester T(
       source_buffer.start(),