[asm.js] Move two unittests into the correct place.

R=clemensh@chromium.org

Change-Id: Iddbf8f2053318d90eaa3f469a36e67afca06b529
Reviewed-on: https://chromium-review.googlesource.com/500347Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45194}

test/unittests/BUILD.gn

@@ -18,6 +18,8 @@ v8_executable("unittests") {
     "api/remote-object-unittest.cc",
     "api/v8-object-unittest.cc",
     "asmjs/asm-scanner-unittest.cc",
+    "asmjs/asm-types-unittest.cc",
+    "asmjs/switch-logic-unittest.cc",
     "base/atomic-utils-unittest.cc",
     "base/bits-unittest.cc",
     "base/cpu-unittest.cc",
@@ -141,14 +143,12 @@ v8_executable("unittests") {
     "test-utils.h",
     "unicode-unittest.cc",
     "value-serializer-unittest.cc",
-    "wasm/asm-types-unittest.cc",
     "wasm/control-transfer-unittest.cc",
     "wasm/decoder-unittest.cc",
     "wasm/function-body-decoder-unittest.cc",
     "wasm/leb-helper-unittest.cc",
     "wasm/loop-assignment-analysis-unittest.cc",
     "wasm/module-decoder-unittest.cc",
-    "wasm/switch-logic-unittest.cc",
     "wasm/wasm-macro-gen-unittest.cc",
     "wasm/wasm-module-builder-unittest.cc",
     "wasm/wasm-opcodes-unittest.cc",

test/unittests/wasm/asm-types-unittest.cc → test/unittests/asmjs/asm-types-unittest.cc

@@ -250,7 +250,8 @@ TEST_F(AsmTypeTest, IsExactly) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -285,7 +286,8 @@ TEST_F(AsmTypeTest, IsA) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -470,7 +472,8 @@ TEST_F(AsmTypeTest, ToReturnType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -496,7 +499,8 @@ TEST_F(AsmTypeTest, IsReturnType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -529,7 +533,8 @@ TEST_F(AsmTypeTest, ToParameterType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -556,7 +561,8 @@ TEST_F(AsmTypeTest, IsParameterType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -584,7 +590,8 @@ TEST_F(AsmTypeTest, IsComparableType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -612,7 +619,8 @@ TEST_F(AsmTypeTest, ElementSizeInBytes) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -650,7 +658,8 @@ TEST_F(AsmTypeTest, LoadType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };
@@ -688,7 +697,8 @@ TEST_F(AsmTypeTest, StoreType) {
       Overload(Function(Type::Int)(Type::Double)),
       Function(Type::Int)(Type::Int, Type::Int),
       Type::MinMaxType(zone(), Type::Signed(), Type::Int()),
-      Function(Type::Int)(Type::Float), Type::FroundType(zone()),
+      Function(Type::Int)(Type::Float),
+      Type::FroundType(zone()),
       Type::FFIType(zone()),
       Type::FunctionTableType(zone(), 10, Function(Type::Void)()),
   };

test/unittests/unittests.gyp

@@ -15,6 +15,8 @@
       'api/remote-object-unittest.cc',
       'api/v8-object-unittest.cc',
       'asmjs/asm-scanner-unittest.cc',
+      'asmjs/asm-types-unittest.cc',
+      'asmjs/switch-logic-unittest.cc',
       'base/atomic-utils-unittest.cc',
       'base/bits-unittest.cc',
       'base/cpu-unittest.cc',
@@ -142,14 +144,12 @@
       'zone/zone-allocator-unittest.cc',
       'zone/zone-chunk-list-unittest.cc',
       'zone/zone-unittest.cc',
-      'wasm/asm-types-unittest.cc',
       'wasm/control-transfer-unittest.cc',
       'wasm/decoder-unittest.cc',
       'wasm/function-body-decoder-unittest.cc',
       'wasm/leb-helper-unittest.cc',
       'wasm/loop-assignment-analysis-unittest.cc',
       'wasm/module-decoder-unittest.cc',
-      'wasm/switch-logic-unittest.cc',
       'wasm/wasm-macro-gen-unittest.cc',
       'wasm/wasm-module-builder-unittest.cc',
       'wasm/wasm-opcodes-unittest.cc',