Use merged JSTest config for performance tests.

The new config is now used for perf measurements. The old
ones are deleted to avoid redundancy.

This also ports https://codereview.chromium.org/754523004 to the new config file.

BUG=chromium:374740
LOG=n
TBR=ulan@chromium.org
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#25674}

diff --git a/test/js-perf-test/Classes/Classes.json b/test/js-perf-test/Classes/Classes.json
deleted file mode 100644 (file)
index fde8732..0000000
--- a/test/js-perf-test/Classes/Classes.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "JSTests/Classes",
-  "path": ["."],
-  "main": "run.js",
-  "flags": ["--harmony-classes"],
-  "run_count": 5,
-  "units": "score",
-  "results_regexp": "^%s\\-Classes\\(Score\\): (.+)$",
-  "total": true,
-  "tests": [
-    {"name": "Super"},
-    {"name": "DefaultConstructor"}
-  ]
-}

diff --git a/test/js-perf-test/Collections/Collections.json b/test/js-perf-test/Collections/Collections.json
deleted file mode 100644 (file)
index fd29f46..0000000
--- a/test/js-perf-test/Collections/Collections.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "JSTests/Collections",
-  "path": ["."],
-  "main": "run.js",
-  "run_count": 5,
-  "units": "score",
-  "results_regexp": "^%s\\-Collections\\(Score\\): (.+)$",
-  "total": true,
-  "tests": [
-    {"name": "Map-Smi"},
-    {"name": "Map-String"},
-    {"name": "Map-Object"},
-    {"name": "Map-Iteration"},
-    {"name": "Set-Smi"},
-    {"name": "Set-String"},
-    {"name": "Set-Object"},
-    {"name": "Set-Iteration"},
-    {"name": "WeakMap"},
-    {"name": "WeakSet"}
-  ]
-}

diff --git a/test/js-perf-test/Iterators/Iterators.json b/test/js-perf-test/Iterators/Iterators.json
deleted file mode 100644 (file)
index 679872e..0000000
--- a/test/js-perf-test/Iterators/Iterators.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "JSTests/Iterators",
-  "path": ["."],
-  "main": "run.js",
-  "run_count": 5,
-  "units": "score",
-  "results_regexp": "^%s\\-Iterators\\(Score\\): (.+)$",
-  "total": true,
-  "tests": [
-    {"name": "ForOf"}
-  ]
-}

diff --git a/test/js-perf-test/JSTests.json b/test/js-perf-test/JSTests.json
index fb3cc9b..0b6956c 100644 (file)
--- a/test/js-perf-test/JSTests.json
+++ b/test/js-perf-test/JSTests.json
@@ -11,11 +11,12 @@
       "name": "Classes",
       "path": ["Classes"],
       "main": "run.js",
-      "resources": ["super.js"],
+      "resources": ["super.js", "default-constructor.js"],
       "flags": ["--harmony-classes"],
       "results_regexp": "^%s\\-Classes\\(Score\\): (.+)$",
       "tests": [
-        {"name": "Super"}
+        {"name": "Super"},
+        {"name": "DefaultConstructor"}
       ]
     },
     {

diff --git a/test/js-perf-test/Strings/Strings.json b/test/js-perf-test/Strings/Strings.json
deleted file mode 100644 (file)
index 871e72f..0000000
--- a/test/js-perf-test/Strings/Strings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "JSTests/Strings",
-  "path": ["."],
-  "main": "run.js",
-  "flags": ["--harmony-strings"],
-  "run_count": 5,
-  "units": "score",
-  "results_regexp": "^%s\\-Strings\\(Score\\): (.+)$",
-  "total": true,
-  "tests": [
-    {"name": "StringFunctions"}
-  ]
-}