From 6bc7248049219678c2498faa66759c09e0141237 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Wed, 30 Sep 2020 16:18:34 +0000 Subject: [PATCH] Skip regress_41329 tests on precompiled runtimes (these tests target the dartdev workflow which is not supported in the precompiled runtime). Also updated regress_41329_relative_test to not be a duplicate of the absolute test. Change-Id: I1df086c8cb2b6a03fad0043bc1f63b08370fdbae Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/165120 Commit-Queue: Ben Konyi Reviewed-by: Siva Annamalai Auto-Submit: Ben Konyi --- tests/standalone/regress_41329_absolute_test.dart | 4 ++-- tests/standalone/standalone_precompiled.status | 1 + tests/standalone_2/regress_41329_absolute_test.dart | 4 ++-- tests/standalone_2/standalone_2_precompiled.status | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/standalone/regress_41329_absolute_test.dart b/tests/standalone/regress_41329_absolute_test.dart index e35e126cb1c..5798cbc8939 100644 --- a/tests/standalone/regress_41329_absolute_test.dart +++ b/tests/standalone/regress_41329_absolute_test.dart @@ -19,7 +19,7 @@ Future main() async { // /usr/local/Cellar/dart/2.8.0-dev.20.0/bin/dart -> $DART_SDK/bin/dart Directory.current = a; - final linkLocation = '../Cellar/dart/2.8.0-dev.20.0/bin/dart'; + final linkLocation = '${d.path}/usr/local/bin/Cellar/dart/2.8.0-dev.20.0/bin/dart'; final link = Link(linkLocation); link.createSync(exePath, recursive: true); @@ -27,6 +27,6 @@ Future main() async { final link2 = Link('dart')..createSync(linkLocation, recursive: true); final path = Uri.parse(link2.absolute.path).path; Directory.current = origDir; - final result = await Process.run('${path}', ['help']); + final result = await Process.run('$path', ['help']); Expect.equals(result.exitCode, 0); } diff --git a/tests/standalone/standalone_precompiled.status b/tests/standalone/standalone_precompiled.status index 6953302ec43..5e5ec81a8eb 100644 --- a/tests/standalone/standalone_precompiled.status +++ b/tests/standalone/standalone_precompiled.status @@ -54,6 +54,7 @@ package/scenarios/packages_file_strange_formatting/empty_lines_test: Skip package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Skip package/scenarios/packages_option_only/packages_option_only_noimports_test: Skip package/scenarios/packages_option_only/packages_option_only_test: Skip +regress_41329_*: SkipByDesign # Expects to find the test directory relative to the script. [ $arch == arm && $mode == release && $runtime == dart_precompiled && $system == android ] io/socket_cancel_connect_test: RuntimeError # Issue 34142 diff --git a/tests/standalone_2/regress_41329_absolute_test.dart b/tests/standalone_2/regress_41329_absolute_test.dart index e35e126cb1c..5798cbc8939 100644 --- a/tests/standalone_2/regress_41329_absolute_test.dart +++ b/tests/standalone_2/regress_41329_absolute_test.dart @@ -19,7 +19,7 @@ Future main() async { // /usr/local/Cellar/dart/2.8.0-dev.20.0/bin/dart -> $DART_SDK/bin/dart Directory.current = a; - final linkLocation = '../Cellar/dart/2.8.0-dev.20.0/bin/dart'; + final linkLocation = '${d.path}/usr/local/bin/Cellar/dart/2.8.0-dev.20.0/bin/dart'; final link = Link(linkLocation); link.createSync(exePath, recursive: true); @@ -27,6 +27,6 @@ Future main() async { final link2 = Link('dart')..createSync(linkLocation, recursive: true); final path = Uri.parse(link2.absolute.path).path; Directory.current = origDir; - final result = await Process.run('${path}', ['help']); + final result = await Process.run('$path', ['help']); Expect.equals(result.exitCode, 0); } diff --git a/tests/standalone_2/standalone_2_precompiled.status b/tests/standalone_2/standalone_2_precompiled.status index 829aafc8c4d..1e00e1258c2 100644 --- a/tests/standalone_2/standalone_2_precompiled.status +++ b/tests/standalone_2/standalone_2_precompiled.status @@ -51,6 +51,7 @@ package/scenarios/packages_file_strange_formatting/empty_lines_test: Skip package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Skip package/scenarios/packages_option_only/packages_option_only_noimports_test: Skip package/scenarios/packages_option_only/packages_option_only_test: Skip +regress_41329_*: SkipByDesign # Expects to be running from 'dart' instead of 'dart_precompiled_runtime' [ $arch == arm && $mode == release && $runtime == dart_precompiled && $system == android ] io/socket_cancel_connect_test: RuntimeError # Issue 34142