Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ extension _ExtensionsApiHandler on Never {
// separators, so the check holds for Windows file URIs as well. Requiring
// an empty host rejects UNC paths (e.g. `file://server/share/...`) and
// keeps `toFilePath()` from throwing on a non-local authority.
final isFileUri = devtoolsOptionsFileUri.scheme == 'file' &&
final isFileUri =
devtoolsOptionsFileUri.scheme == 'file' &&
devtoolsOptionsFileUri.host.isEmpty;
final fileName = isFileUri
? p.basename(devtoolsOptionsFileUri.toFilePath())
Expand Down
5 changes: 2 additions & 3 deletions tool/ci/bots.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ 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.
$(dirname $(which flutter))/dart format --output=none --set-exit-if-changed .
# Here, we use the dart instance from the flutter SDK.
dart format --output=none --set-exit-if-changed .

# Make sure the app versions are in sync.
dt repo-check
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.
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.
dart format --output=none --set-exit-if-changed .

# Note that this will _not_ test any tests in nested directories, if we add
# any.
Comment on lines +33 to +34

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm this seems like a bug? why aren't we running flutter test test/

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure. I can fix it in a separate PR.

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.
dart format --output=none --set-exit-if-changed .

dart test test/
popd

Expand Down
7 changes: 6 additions & 1 deletion 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.
dart format --output=none --set-exit-if-changed lib/ test/

flutter test test/
popd
popd
Loading