Skip to content

Commit 72ee544

Browse files
rmacnak-googleCommit Queue
authored andcommitted
[build] Install dartaotruntime to /usr/bin in the Debian package.
This removes a discrepancy in what is on PATH when installing the SDK via the Debian package versus unpacking the ZIP and adding dart-sdk/bin to PATH. Bug: #49293 Cq-Include-Trybots: luci.dart.try:dart-sdk-linux-try Change-Id: I57361cc090449dd4fd7a8e4ebbc60ace71af11fb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431741 Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Siva Annamalai <[email protected]>
1 parent 9f0e522 commit 72ee544

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
usr/lib/dart/bin/dart usr/bin/dart
2+
usr/lib/dart/bin/dartaotruntime usr/bin/dartaotruntime
23

tools/debian_package/test_debian_package.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ set -ex
77
debfile="$1"
88
checkout=$(pwd)
99

10+
# api.buildbucket.gitiles_commit.id is not populated in try jobs :(
11+
if [ ! -f $debfile ]; then
12+
echo "warning: $debfile does not exist"
13+
version=$(tools/debian_package/get_version.py)
14+
debfile="out/ReleaseX64/dart_${version}-1_amd64.deb"
15+
fi
16+
1017
function test_image() {
1118
image="$1"
1219
docker run -v $checkout:$checkout -w $checkout -i --rm $image tools/debian_package/test_debian_package_inside_docker.sh $debfile

tools/debian_package/test_debian_package_inside_docker.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ dart analyze /tmp/hello.dart
2222
# Test VM JIT
2323
dart /tmp/hello.dart
2424

25-
# Test VM AOT
25+
# Test VM AOT - proper library, dartaotruntime on PATH
26+
dart compile aot-snapshot -o /tmp/libhello.so /tmp/hello.dart
27+
dartaotruntime /tmp/libhello.so
28+
29+
# Test VM AOT - self-contained executable
2630
dart compile exe -o /tmp/hello.exe /tmp/hello.dart
2731
/tmp/hello.exe
2832

0 commit comments

Comments
 (0)