Commit 43cc21a1 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[test] Replace deprecated test262 test config entry

The entries test262_variants and test262 are now equal after previous changes.
This switches all to test262 to prepare removing the former.

Bug: v8:9791
Change-Id: I677ea36798556e1aeed8bc11c3272804141e1eb8
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1835539Reviewed-by: 's avatarTamer Tas <tmrts@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#64122}
parent 2fd3e180
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
{'name': 'mozilla'}, {'name': 'mozilla'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'test262', 'variant': 'default', 'shards': 2}, {'name': 'test262', 'variant': 'default', 'shards': 2},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 3}, {'name': 'test262', 'variant': 'extra', 'shards': 3},
{'name': 'v8testing', 'shards': 3}, {'name': 'v8testing', 'shards': 3},
{'name': 'v8testing', 'variant': 'extra', 'shards': 2}, {'name': 'v8testing', 'variant': 'extra', 'shards': 2},
], ],
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
{'name': 'benchmarks', 'variant': 'extra'}, {'name': 'benchmarks', 'variant': 'extra'},
{'name': 'mozilla'}, {'name': 'mozilla'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'test262_variants', 'shards': 2}, {'name': 'test262', 'shards': 2},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 2}, {'name': 'test262', 'variant': 'extra', 'shards': 2},
{'name': 'v8testing', 'shards': 2}, {'name': 'v8testing', 'shards': 2},
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
], ],
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
{'name': 'mozilla'}, {'name': 'mozilla'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'optimize_for_size'}, {'name': 'optimize_for_size'},
{'name': 'test262_variants', 'shards': 4}, {'name': 'test262', 'shards': 4},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 3}, {'name': 'test262', 'variant': 'extra', 'shards': 3},
{'name': 'v8testing', 'shards': 2}, {'name': 'v8testing', 'shards': 2},
{'name': 'v8testing', 'suffix': 'isolates', 'test_args': ['--isolates'], 'shards': 2}, {'name': 'v8testing', 'suffix': 'isolates', 'test_args': ['--isolates'], 'shards': 2},
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
{'name': 'benchmarks', 'variant': 'code_serializer', 'shards': 1}, {'name': 'benchmarks', 'variant': 'code_serializer', 'shards': 1},
{'name': 'd8testing', 'variant': 'code_serializer', 'shards': 1}, {'name': 'd8testing', 'variant': 'code_serializer', 'shards': 1},
{'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1}, {'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1},
{'name': 'test262_variants', 'variant': 'code_serializer', 'shards': 1}, {'name': 'test262', 'variant': 'code_serializer', 'shards': 1},
# No SSE3. # No SSE3.
{ {
'name': 'mozilla', 'name': 'mozilla',
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
'os': 'Ubuntu-16.04', 'os': 'Ubuntu-16.04',
}, },
'tests': [ 'tests': [
{'name': 'test262_variants', 'shards': 7}, {'name': 'test262', 'shards': 7},
{'name': 'v8testing', 'shards': 3}, {'name': 'v8testing', 'shards': 3},
{'name': 'v8testing', 'variant': 'extra', 'shards': 2}, {'name': 'v8testing', 'variant': 'extra', 'shards': 2},
{'name': 'v8testing', 'variant': 'slow_path'}, {'name': 'v8testing', 'variant': 'slow_path'},
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
{'name': 'mozilla'}, {'name': 'mozilla'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'test262', 'variant': 'default'}, {'name': 'test262', 'variant': 'default'},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 3}, {'name': 'test262', 'variant': 'extra', 'shards': 3},
{'name': 'v8testing', 'shards': 3}, {'name': 'v8testing', 'shards': 3},
{'name': 'v8testing', 'variant': 'extra', 'shards': 2}, {'name': 'v8testing', 'variant': 'extra', 'shards': 2},
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1}, {'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
{'name': 'mjsunit', 'variant': 'stress_sampling'}, {'name': 'mjsunit', 'variant': 'stress_sampling'},
{'name': 'webkit', 'variant': 'stress_sampling'}, {'name': 'webkit', 'variant': 'stress_sampling'},
# Infra staging. # Infra staging.
{'name': 'test262_variants', 'variant': 'infra_staging', 'shards': 2}, {'name': 'test262', 'variant': 'infra_staging', 'shards': 2},
{'name': 'v8testing', 'variant': 'infra_staging', 'shards': 2}, {'name': 'v8testing', 'variant': 'infra_staging', 'shards': 2},
], ],
}, },
...@@ -337,9 +337,9 @@ ...@@ -337,9 +337,9 @@
{'name': 'mozilla', 'variant': 'assert_types'}, {'name': 'mozilla', 'variant': 'assert_types'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'perf_integration'}, {'name': 'perf_integration'},
{'name': 'test262_variants', 'shards': 2}, {'name': 'test262', 'shards': 2},
{'name': 'test262_variants', 'variant': 'assert_types', 'shards': 2}, {'name': 'test262', 'variant': 'assert_types', 'shards': 2},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 2}, {'name': 'test262', 'variant': 'extra', 'shards': 2},
{'name': 'v8testing', 'shards': 2}, {'name': 'v8testing', 'shards': 2},
{'name': 'v8testing', 'variant': 'assert_types'}, {'name': 'v8testing', 'variant': 'assert_types'},
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
...@@ -371,8 +371,8 @@ ...@@ -371,8 +371,8 @@
# TODO(machenbach): Add mozilla tests. # TODO(machenbach): Add mozilla tests.
{'name': 'mjsunit_sp_frame_access'}, {'name': 'mjsunit_sp_frame_access'},
{'name': 'optimize_for_size'}, {'name': 'optimize_for_size'},
{'name': 'test262_variants', 'shards': 4}, {'name': 'test262', 'shards': 4},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 3}, {'name': 'test262', 'variant': 'extra', 'shards': 3},
{'name': 'v8initializers'}, {'name': 'v8initializers'},
{'name': 'v8testing', 'shards': 2}, {'name': 'v8testing', 'shards': 2},
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
...@@ -650,8 +650,8 @@ ...@@ -650,8 +650,8 @@
{'name': 'mozilla'}, {'name': 'mozilla'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'optimize_for_size'}, {'name': 'optimize_for_size'},
{'name': 'test262_variants', 'shards': 2}, {'name': 'test262', 'shards': 2},
{'name': 'test262_variants', 'variant': 'extra'}, {'name': 'test262', 'variant': 'extra'},
{'name': 'v8initializers'}, {'name': 'v8initializers'},
{'name': 'v8testing'}, {'name': 'v8testing'},
{'name': 'v8testing', 'suffix': 'isolates', 'test_args': ['--isolates']}, {'name': 'v8testing', 'suffix': 'isolates', 'test_args': ['--isolates']},
...@@ -704,9 +704,9 @@ ...@@ -704,9 +704,9 @@
{'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1}, {'name': 'mozilla', 'variant': 'code_serializer', 'shards': 1},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'optimize_for_size'}, {'name': 'optimize_for_size'},
{'name': 'test262_variants', 'shards': 6}, {'name': 'test262', 'shards': 6},
{'name': 'test262_variants', 'variant': 'code_serializer', 'shards': 2}, {'name': 'test262', 'variant': 'code_serializer', 'shards': 2},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 3}, {'name': 'test262', 'variant': 'extra', 'shards': 3},
{'name': 'v8testing', 'shards': 3}, {'name': 'v8testing', 'shards': 3},
{ {
'name': 'v8testing', 'name': 'v8testing',
...@@ -874,9 +874,9 @@ ...@@ -874,9 +874,9 @@
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'optimize_for_size'}, {'name': 'optimize_for_size'},
{'name': 'perf_integration'}, {'name': 'perf_integration'},
{'name': 'test262_variants', 'shards': 2}, {'name': 'test262', 'shards': 2},
{'name': 'test262_variants', 'variant': 'assert_types'}, {'name': 'test262', 'variant': 'assert_types'},
{'name': 'test262_variants', 'variant': 'extra'}, {'name': 'test262', 'variant': 'extra'},
{'name': 'v8initializers'}, {'name': 'v8initializers'},
{'name': 'v8testing'}, {'name': 'v8testing'},
{'name': 'v8testing', 'variant': 'assert_types'}, {'name': 'v8testing', 'variant': 'assert_types'},
...@@ -933,8 +933,8 @@ ...@@ -933,8 +933,8 @@
{'name': 'mozilla'}, {'name': 'mozilla'},
{'name': 'mozilla', 'variant': 'extra'}, {'name': 'mozilla', 'variant': 'extra'},
{'name': 'optimize_for_size'}, {'name': 'optimize_for_size'},
{'name': 'test262_variants', 'shards': 5}, {'name': 'test262', 'shards': 5},
{'name': 'test262_variants', 'variant': 'extra', 'shards': 3}, {'name': 'test262', 'variant': 'extra', 'shards': 3},
{'name': 'v8testing', 'shards': 2}, {'name': 'v8testing', 'shards': 2},
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
{'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1}, {'name': 'v8testing', 'variant': 'minor_mc', 'shards': 1},
...@@ -1043,7 +1043,7 @@ ...@@ -1043,7 +1043,7 @@
'os': 'Ubuntu-16.04', 'os': 'Ubuntu-16.04',
}, },
'tests': [ 'tests': [
{'name': 'test262_variants', 'shards': 5}, {'name': 'test262', 'shards': 5},
{'name': 'v8testing', 'shards': 2}, {'name': 'v8testing', 'shards': 2},
{'name': 'v8testing', 'variant': 'extra'}, {'name': 'v8testing', 'variant': 'extra'},
{'name': 'v8testing', 'variant': 'slow_path', 'shards': 1}, {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
...@@ -1247,7 +1247,7 @@ ...@@ -1247,7 +1247,7 @@
}, },
'tests': [ 'tests': [
{'name': 'mozilla', 'variant': 'default'}, {'name': 'mozilla', 'variant': 'default'},
{'name': 'test262_variants', 'variant': 'default', 'shards': 8}, {'name': 'test262', 'variant': 'default', 'shards': 8},
{'name': 'v8testing', 'variant': 'default', 'shards': 3}, {'name': 'v8testing', 'variant': 'default', 'shards': 3},
{'name': 'v8testing', 'variant': 'trusted', 'shards': 3}, {'name': 'v8testing', 'variant': 'trusted', 'shards': 3},
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment