[vm/stress] Clean up legacy tests from isolate stress trest runs.

This is follow-up to 2ee771a4f6 to fix iso_stress_linux bot.

TEST=ci

Change-Id: Ic6840481287b5af943252bef9854e0be4049553b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337003
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>

runtime/tests/concurrency/generate_stress_test.dart

@@ -10,18 +10,14 @@ import 'package:path/path.dart' as path;
 
 final thisDirectory = path.join('runtime', 'tests', 'concurrency');
 final stressTestListJson = path.join(thisDirectory, 'stress_test_list.json');
-final generatedTest = path.join(thisDirectory, 'generated_stress_test.dart');
-final generatedNnbdTest =
-    path.join(path.join(thisDirectory, 'generated_stress_test_nnbd.dart'));
+final generatedTest =
+    path.join(path.join(thisDirectory, 'generated_stress_test.dart'));
 
-final Map testMap = json.decode(File(stressTestListJson).readAsStringSync());
-final testFiles = testMap['non-nnbd'].cast<String>();
-final testFilesNnbd = testMap['nnbd'].cast<String>();
+final List<String> testFiles =
+    List<String>.from(json.decode(File(stressTestListJson).readAsStringSync()));
 final dart = 'tools/sdks/dart-sdk/bin/dart';
 
 main(List<String> args) async {
-  File(generatedNnbdTest)
-      .writeAsStringSync(await generateStressTest(testFilesNnbd));
   File(generatedTest).writeAsStringSync(await generateStressTest(testFiles));
 }
 

runtime/tests/concurrency/generate_stress_test_list.dart

@@ -21,21 +21,12 @@ final dartDirectories = [
   'tests/lib',
   'tests/standalone',
 ];
-final dart2Directories = [
-  'tests/corelib_2',
-  'tests/language_2',
-  'tests/lib_2',
-];
 
 main(List<String> args) async {
-  final testFiles = await findValidTests(dart2Directories, false);
-  final nnbdTestFiles = await findValidTests(dartDirectories, true);
+  final testFiles = await findValidTests(dartDirectories, true);
 
   File(stressTestListJson)
-      .writeAsStringSync(const JsonEncoder.withIndent('  ').convert({
-    'nnbd': nnbdTestFiles,
-    'non-nnbd': testFiles,
-  }));
+      .writeAsStringSync(const JsonEncoder.withIndent('  ').convert(testFiles));
 }
 
 Future<List<String>> findValidTests(List<String> directories, bool nnbd) async {

runtime/tests/concurrency/run_stress_test_shards.dart

@@ -139,7 +139,7 @@ final configurations = <TestRunner>[
   JitTestRunner('out/DebugX64', [
     '--disable-dart-dev',
     '--sound-null-safety',
-    'runtime/tests/concurrency/generated_stress_test_nnbd.dart.jit.dill',
+    'runtime/tests/concurrency/generated_stress_test.dart.jit.dill',
   ]),
   JitTestRunner('out/ReleaseX64', [
     '--disable-dart-dev',
@@ -147,7 +147,7 @@ final configurations = <TestRunner>[
     '--no-inline-alloc',
     '--use-slow-path',
     '--deoptimize-on-runtime-call-every=3',
-    'runtime/tests/concurrency/generated_stress_test_nnbd.dart.jit.dill',
+    'runtime/tests/concurrency/generated_stress_test.dart.jit.dill',
   ]),
   for (int i = 0; i < tsanShards; ++i)
     JitTestRunner('out/ReleaseTSANX64', [
@@ -156,17 +156,17 @@ final configurations = <TestRunner>[
       '-Dshard=$i',
       '-Dshards=$tsanShards',
       '--sound-null-safety',
-      'runtime/tests/concurrency/generated_stress_test_nnbd.dart.jit.dill',
+      'runtime/tests/concurrency/generated_stress_test.dart.jit.dill',
     ]),
   AotTestRunner('out/ReleaseX64', [
     '--sound-null-safety',
-    'runtime/tests/concurrency/generated_stress_test_nnbd.dart.aot.dill',
+    'runtime/tests/concurrency/generated_stress_test.dart.aot.dill',
   ], [
     '--sound-null-safety',
   ]),
   AotTestRunner('out/DebugX64', [
     '--sound-null-safety',
-    'runtime/tests/concurrency/generated_stress_test_nnbd.dart.aot.dill',
+    'runtime/tests/concurrency/generated_stress_test.dart.aot.dill',
   ], [
     '--sound-null-safety',
   ]),

runtime/tests/vm/dart/isolates/concurrency_stress_sanity_test.dart

@@ -10,7 +10,7 @@ import 'package:expect/expect.dart';
 
 import '../snapshot_test_helper.dart';
 import '../../../concurrency/generate_stress_test.dart'
-    show testFilesNnbd, generateStressTest;
+    show testFiles, generateStressTest;
 
 // The only purpose of the test is to ensure we can generate a isolate stress
 // test out of many normal dart tests (that are expected to be short-lived and
@@ -28,7 +28,7 @@ main() async {
     final stressTestDill = path.join(tempDir, 'stress_test.dill');
 
     // Generate stress test.
-    File(stressTest).writeAsStringSync(await generateStressTest(testFilesNnbd));
+    File(stressTest).writeAsStringSync(await generateStressTest(testFiles));
 
     final packageConfig =
         path.join(path.absolute('.'), '.dart_tool/package_config.json');

tools/bots/test_matrix.json

@@ -3272,20 +3272,7 @@
             "--platform=out/ReleaseX64/vm_platform_strong.dill",
             "--no-aot",
             "-o",
-            "runtime/tests/concurrency/generated_stress_test_nnbd.dart.jit.dill",
-            "runtime/tests/concurrency/generated_stress_test_nnbd.dart"
-          ]
-        },
-        {
-          "name": "Generate Isolate Stress Test - AOT Dill",
-          "script": "out/ReleaseX64/dart",
-          "arguments": [
-            "pkg/vm/bin/gen_kernel.dart",
-            "--platform=out/ReleaseX64/vm_platform_strong.dill",
-            "--aot",
-            "--no-sound-null-safety",
-            "-o",
-            "runtime/tests/concurrency/generated_stress_test.dart.aot.dill",
+            "runtime/tests/concurrency/generated_stress_test.dart.jit.dill",
             "runtime/tests/concurrency/generated_stress_test.dart"
           ]
         },
@@ -3297,8 +3284,8 @@
             "--platform=out/ReleaseX64/vm_platform_strong.dill",
             "--aot",
             "-o",
-            "runtime/tests/concurrency/generated_stress_test_nnbd.dart.aot.dill",
-            "runtime/tests/concurrency/generated_stress_test_nnbd.dart"
+            "runtime/tests/concurrency/generated_stress_test.dart.aot.dill",
+            "runtime/tests/concurrency/generated_stress_test.dart"
           ]
         },
         {