Skip to content

Commit

Permalink
Change support for VM service message from "The Dart VM Service is li…
Browse files Browse the repository at this point in the history
…stening" to "The Dart VM service is listening" (flutter#31361)

See dart-lang/sdk#46756
  • Loading branch information
bkonyi authored Feb 10, 2022
1 parent 90effff commit 3764a8f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void VMServiceObject::GetContents(LazyEntryVector* out_vector) const {
std::vector<std::string> files;
if (!ReadDirContents(kPortDir, &files)) {
FX_LOGF(ERROR, LOG_TAG,
"Failed to read Dart VM Service port directory '%s': %s", kPortDir,
"Failed to read Dart VM service port directory '%s': %s", kPortDir,
strerror(errno));
return;
}
Expand Down
2 changes: 1 addition & 1 deletion shell/testing/observatory/launcher.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ShellProcess {

Uri? _extractVMServiceUri(String str) {
final listeningMessageRegExp = RegExp(
r'(?:Observatory|The Dart VM Service is) listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)',
r'(?:Observatory|The Dart VM service is) listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)',
);
final match = listeningMessageRegExp.firstMatch(str);
if (match != null) {
Expand Down
2 changes: 1 addition & 1 deletion testing/android_systrace_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def LaunchPackage(package_name, activity_name, adb_path='adb'):
'%s/%s' % (package_name, activity_name)], stderr=subprocess.STDOUT)
for line in logcat.stdout:
print('>>>>>>>> ' + line.strip())
if ('Observatory listening' in line) or ('Dart VM Service is listening' in line):
if ('Observatory listening' in line) or ('Dart VM service is listening' in line):
logcat.kill()
break

Expand Down

0 comments on commit 3764a8f

Please sign in to comment.