Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tool/ci/bots.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ echo `pwd`

if [ "$BOT" = "main" ]; then

# Verify that dart format has been run.
echo "Checking formatting..."
# Here, we use the dart instance from the flutter sdk.
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
Comment on lines +19 to 20

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] Running $(dirname $(which flutter))/dart invokes the Dart wrapper script from flutter/bin, which can print "Waiting for another flutter command..." at inopportune times. As documented in setup.sh, the PATH is already configured to prioritize the direct Dart SDK binary. We should run dart format directly instead, which also makes the explanatory comment unnecessary.

Suggested change
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
dart format --output=none --set-exit-if-changed .


# Make sure the app versions are in sync.
Expand Down
17 changes: 17 additions & 0 deletions tool/ci/package_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,25 @@ if [ "$PACKAGE" = "devtools_app_shared" ]; then

pushd $DEVTOOLS_DIR/packages/devtools_app_shared
echo `pwd`

echo "Checking formatting..."
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
Comment on lines +18 to +19

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] Running $(dirname $(which flutter))/dart invokes the Dart wrapper script from flutter/bin, which can print "Waiting for another flutter command..." at inopportune times. As documented in setup.sh, the PATH is already configured to prioritize the direct Dart SDK binary. We should run dart format directly instead, which also makes the explanatory comment unnecessary.

Suggested change
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
dart format --output=none --set-exit-if-changed .


flutter test test/
popd

elif [ "$PACKAGE" = "devtools_extensions" ]; then

pushd $DEVTOOLS_DIR/packages/devtools_extensions
echo `pwd`

echo "Checking formatting..."
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
Comment on lines +30 to +31

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] Running $(dirname $(which flutter))/dart invokes the Dart wrapper script from flutter/bin, which can print "Waiting for another flutter command..." at inopportune times. As documented in setup.sh, the PATH is already configured to prioritize the direct Dart SDK binary. We should run dart format directly instead, which also makes the explanatory comment unnecessary.

Suggested change
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
dart format --output=none --set-exit-if-changed .


# Note that this will _not_ test any tests in nested directories, if we add
# any.
flutter test test/*_test.dart
# Skip this on Windows because `flutter test --platform chrome`
# appears to hang there.
Expand All @@ -33,6 +45,11 @@ elif [ "$PACKAGE" = "devtools_shared" ]; then

pushd $DEVTOOLS_DIR/packages/devtools_shared
echo `pwd`

echo "Checking formatting..."
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
Comment on lines +50 to +51

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] Running $(dirname $(which flutter))/dart invokes the Dart wrapper script from flutter/bin, which can print "Waiting for another flutter command..." at inopportune times. As documented in setup.sh, the PATH is already configured to prioritize the direct Dart SDK binary. We should run dart format directly instead, which also makes the explanatory comment unnecessary.

Suggested change
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
dart format --output=none --set-exit-if-changed .


dart test test/
popd

Expand Down
5 changes: 5 additions & 0 deletions tool/ci/tool_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,10 @@ source ./tool/ci/setup.sh

pushd $DEVTOOLS_DIR/tool
echo `pwd`

echo "Checking formatting..."
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed lib/ test/
Comment on lines +16 to +17

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] Running $(dirname $(which flutter))/dart invokes the Dart wrapper script from flutter/bin, which can print "Waiting for another flutter command..." at inopportune times. As documented in setup.sh, the PATH is already configured to prioritize the direct Dart SDK binary. We should run dart format directly instead, which also makes the explanatory comment unnecessary.

Suggested change
# Here, we use the dart instance from the flutter SDK.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed lib/ test/
dart format --output=none --set-exit-if-changed lib/ test/


flutter test test/
popd
Loading