Fix stack trace mapping for SDK locations (#1175)
These were disabled because non-hermetic URIs were present. They have
been replaced with `org-dartlang-sdk` URIs. Update the SDK URI base so
that the replacement works for these URIs.
The tests in `pub_serve_test.dart` are still skipped for other reasons
so we can't guarantee they are fixed correctly here. Once we unskip
those tests we wouldn't want to hide issues with the stack trace
mapping, so we'll remove that reason for the skip.
diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md
index ac13bd7..43b3c90 100644
--- a/pkgs/test/CHANGELOG.md
+++ b/pkgs/test/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.12.1-dev
+
+* Fix the stack trace labels in SDK code for `dart2js` compiled tests.
+
## 1.12.0
* Bump minimum SDK to `2.4.0` for safer usage of for-loop elements.
diff --git a/pkgs/test/lib/src/runner/browser/platform.dart b/pkgs/test/lib/src/runner/browser/platform.dart
index 199ee3b..0fff1ed 100644
--- a/pkgs/test/lib/src/runner/browser/platform.dart
+++ b/pkgs/test/lib/src/runner/browser/platform.dart
@@ -411,7 +411,7 @@
_mappers[dartPath] = JSStackTraceMapper(File(mapPath).readAsStringSync(),
mapUrl: p.toUri(mapPath),
packageResolver: await PackageResolver.current.asSync,
- sdkRoot: p.toUri(sdkDir));
+ sdkRoot: Uri.parse('org-dartlang-sdk:///sdk'));
});
}
diff --git a/pkgs/test/lib/src/runner/node/platform.dart b/pkgs/test/lib/src/runner/node/platform.dart
index bc23173..e8ba74c 100644
--- a/pkgs/test/lib/src/runner/node/platform.dart
+++ b/pkgs/test/lib/src/runner/node/platform.dart
@@ -173,7 +173,7 @@
mapper = JSStackTraceMapper(await File(mapPath).readAsString(),
mapUrl: p.toUri(mapPath),
packageResolver: await PackageResolver.current.asSync,
- sdkRoot: p.toUri(sdkDir));
+ sdkRoot: Uri.parse('org-dartlang-sdk:///sdk'));
}
return Pair(await _startProcess(runtime, jsPath, socketPort), mapper);
@@ -196,7 +196,7 @@
mapper = JSStackTraceMapper(await File(mapPath).readAsString(),
mapUrl: p.toUri(mapPath),
packageResolver: resolver,
- sdkRoot: p.toUri(sdkDir));
+ sdkRoot: Uri.parse('org-dartlang-sdk:///sdk'));
}
return Pair(await _startProcess(runtime, jsPath, socketPort), mapper);
diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml
index 7d58b1f..6cbdc42 100644
--- a/pkgs/test/pubspec.yaml
+++ b/pkgs/test/pubspec.yaml
@@ -1,5 +1,5 @@
name: test
-version: 1.12.0
+version: 1.12.1-dev
description: A full featured library for writing and running Dart tests.
homepage: https://github.com/dart-lang/test/blob/master/pkgs/test
diff --git a/pkgs/test/test/runner/browser/runner_test.dart b/pkgs/test/test/runner/browser/runner_test.dart
index 4f118d1..e81e3c9 100644
--- a/pkgs/test/test/runner/browser/runner_test.dart
+++ b/pkgs/test/test/runner/browser/runner_test.dart
@@ -703,7 +703,7 @@
containsInOrder(
[' main.<fn>', 'package:test', 'dart:async/zone.dart']));
await test.shouldExit(1);
- }, tags: 'chrome', skip: 'Broken by sdk#32633');
+ }, tags: 'chrome');
test("doesn't dartify stack traces for JS-compiled tests with --js-trace",
() async {
diff --git a/pkgs/test/test/runner/node/runner_test.dart b/pkgs/test/test/runner/node/runner_test.dart
index 6f1e1fe..3703f75 100644
--- a/pkgs/test/test/runner/node/runner_test.dart
+++ b/pkgs/test/test/runner/node/runner_test.dart
@@ -202,7 +202,7 @@
containsInOrder(
[' main.<fn>', 'package:test', 'dart:async/zone.dart']));
await test.shouldExit(1);
- }, skip: 'Broken by sdk#32633');
+ });
test("doesn't dartify stack traces for JS-compiled tests with --js-trace",
() async {
diff --git a/pkgs/test/test/runner/pub_serve_test.dart b/pkgs/test/test/runner/pub_serve_test.dart
index c023945..744385c 100644
--- a/pkgs/test/test/runner/pub_serve_test.dart
+++ b/pkgs/test/test/runner/pub_serve_test.dart
@@ -235,7 +235,7 @@
await test.shouldExit(1);
await pub.kill();
}, tags: 'node');
- }, skip: 'Broken by sdk#32633');
+ });
group("doesn't dartify stack traces for JS-compiled tests with --js-trace",
() {
