[Test tool] Remove -c dartkb configuration
Change-Id: I178f18484b853aa35248fa9f6252509ec0df6832
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/169500
Auto-Submit: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
diff --git a/pkg/smith/lib/configuration.dart b/pkg/smith/lib/configuration.dart
index b96782c..846d39d 100644
--- a/pkg/smith/lib/configuration.dart
+++ b/pkg/smith/lib/configuration.dart
@@ -611,7 +611,6 @@
static const appJitk = Compiler._('app_jitk');
static const dartk = Compiler._('dartk');
static const dartkp = Compiler._('dartkp');
- static const dartkb = Compiler._('dartkb');
static const specParser = Compiler._('spec_parser');
static const fasta = Compiler._('fasta');
@@ -627,7 +626,6 @@
appJitk,
dartk,
dartkp,
- dartkb,
specParser,
fasta,
], key: (compiler) => (compiler as Compiler).name);
@@ -680,7 +678,6 @@
return const [Runtime.none];
case Compiler.appJitk:
case Compiler.dartk:
- case Compiler.dartkb:
return const [Runtime.vm, Runtime.selfCheck];
case Compiler.dartkp:
return const [Runtime.dartPrecompiled];
@@ -709,7 +706,6 @@
return Runtime.none;
case Compiler.appJitk:
case Compiler.dartk:
- case Compiler.dartkb:
return Runtime.vm;
case Compiler.dartkp:
return Runtime.dartPrecompiled;
diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart
index 616cf8c..595dc6b 100644
--- a/pkg/test_runner/lib/src/compiler_configuration.dart
+++ b/pkg/test_runner/lib/src/compiler_configuration.dart
@@ -98,7 +98,6 @@
return AppJitCompilerConfiguration(configuration);
case Compiler.dartk:
- case Compiler.dartkb:
if (configuration.architecture == Architecture.simarm ||
configuration.architecture == Architecture.simarm64 ||
configuration.system == System.android) {
diff --git a/pkg/test_runner/lib/src/configuration.dart b/pkg/test_runner/lib/src/configuration.dart
index 2392b63..a0bafae 100644
--- a/pkg/test_runner/lib/src/configuration.dart
+++ b/pkg/test_runner/lib/src/configuration.dart
@@ -200,7 +200,6 @@
Compiler.appJitk,
Compiler.dartdevk,
Compiler.dartk,
- Compiler.dartkb,
Compiler.dartkp,
Compiler.fasta,
Compiler.dart2js,
diff --git a/pkg/test_runner/lib/src/options.dart b/pkg/test_runner/lib/src/options.dart
index 91a6317..231dd81 100644
--- a/pkg/test_runner/lib/src/options.dart
+++ b/pkg/test_runner/lib/src/options.dart
@@ -106,8 +106,6 @@
app_jitk: Compile the Dart code into Kernel and then into an app
snapshot.
dartk: Compile the Dart code into Kernel before running test.
-dartkb: Compile the Dart code into Kernel with bytecode before
- running test.
dartkp: Compile the Dart code into Kernel and then Kernel into
AOT snapshot before running the test.
spec_parser: Parse Dart code using the specification parser.
diff --git a/pkg/test_runner/lib/src/runtime_configuration.dart b/pkg/test_runner/lib/src/runtime_configuration.dart
index 2cb95c7..1aa0891 100644
--- a/pkg/test_runner/lib/src/runtime_configuration.dart
+++ b/pkg/test_runner/lib/src/runtime_configuration.dart
@@ -251,9 +251,6 @@
break;
}
- if (_configuration.compiler == Compiler.dartkb) {
- multiplier *= 4;
- }
if (mode.isDebug) {
multiplier *= 2;
}
diff --git a/pkg/test_runner/lib/src/test_configurations.dart b/pkg/test_runner/lib/src/test_configurations.dart
index 36024d9..0b3fb76 100644
--- a/pkg/test_runner/lib/src/test_configurations.dart
+++ b/pkg/test_runner/lib/src/test_configurations.dart
@@ -141,8 +141,7 @@
if (key == 'co19_2' || key == 'co19') {
testSuites.add(Co19TestSuite(configuration, key));
} else if ((configuration.compiler == Compiler.none ||
- configuration.compiler == Compiler.dartk ||
- configuration.compiler == Compiler.dartkb) &&
+ configuration.compiler == Compiler.dartk) &&
configuration.runtime == Runtime.vm &&
key == 'vm') {
// vm tests contain both cc tests (added here) and dart tests (added
diff --git a/pkg/test_runner/lib/src/test_suite.dart b/pkg/test_runner/lib/src/test_suite.dart
index ebeb78a..e788744 100644
--- a/pkg/test_runner/lib/src/test_suite.dart
+++ b/pkg/test_runner/lib/src/test_suite.dart
@@ -889,7 +889,6 @@
const compilers = [
Compiler.none,
Compiler.dartk,
- Compiler.dartkb,
Compiler.dartkp,
Compiler.appJitk,
];
diff --git a/pkg/test_runner/lib/src/utils.dart b/pkg/test_runner/lib/src/utils.dart
index ba61a15..b1c41171 100644
--- a/pkg/test_runner/lib/src/utils.dart
+++ b/pkg/test_runner/lib/src/utils.dart
@@ -413,7 +413,6 @@
static void deleteTempSnapshotDirectory(TestConfiguration configuration) {
if (configuration.compiler == Compiler.dartk ||
- configuration.compiler == Compiler.dartkb ||
configuration.compiler == Compiler.dartkp) {
var checked = configuration.isChecked ? '-checked' : '';
var minified = configuration.isMinified ? '-minified' : '';
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 7c7ccd0..f8cbe1d 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -3253,7 +3253,7 @@
]
},
{
- "name": "remove out directory to do a clean linux-x64-bytecode build",
+ "name": "remove out directory",
"script": "tools/bots/try_benchmarks.sh",
"arguments": [
"clean"
diff --git a/tools/git_cl_try.sh b/tools/git_cl_try.sh
index 573465d..12f56b9 100644
--- a/tools/git_cl_try.sh
+++ b/tools/git_cl_try.sh
@@ -6,13 +6,6 @@
-b app-kernel-linux-product-x64-try \
-b app-kernel-linux-release-x64-try
}
-function git-cl-try-vm-jit-dartkb {
- echo "git-cl-try-vm-jit-dartkb"
- git cl try -B dart/try \
- -b vm-dartkb-linux-release-simarm64-try \
- -b vm-dartkb-linux-release-x64-abi-try \
- -b vm-dartkb-linux-release-x64-try
-}
function git-cl-try-vm-jit-reload {
echo "git-cl-try-vm-jit-reload"
git cl try -B dart/try \
@@ -85,7 +78,6 @@
function git-cl-try-vm-all {
echo "git-cl-try-vm-all"
git-cl-try-vm-jit-app
- git-cl-try-vm-jit-dartkb
git-cl-try-vm-jit-reload
git-cl-try-vm-jit-rest
git-cl-try-vm-ffi
