Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
d0a29dc1
Unverified
Commit
d0a29dc1
authored
Mar 13, 2021
by
Jenn Magder
Committed by
GitHub
Mar 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow local networking Info.plist insertion to fail (#78085)
parent
9f4e132f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
xcode_backend.sh
packages/flutter_tools/bin/xcode_backend.sh
+4
-2
xcode_backend_test.dart
...tter_tools/test/integration.shard/xcode_backend_test.dart
+3
-3
No files found.
packages/flutter_tools/bin/xcode_backend.sh
View file @
d0a29dc1
...
@@ -235,8 +235,10 @@ AddObservatoryBonjourService() {
...
@@ -235,8 +235,10 @@ AddObservatoryBonjourService() {
local
built_products_plist
=
"
${
BUILT_PRODUCTS_DIR
}
/
${
INFOPLIST_PATH
}
"
local
built_products_plist
=
"
${
BUILT_PRODUCTS_DIR
}
/
${
INFOPLIST_PATH
}
"
if
[[
!
-f
"
${
built_products_plist
}
"
]]
;
then
if
[[
!
-f
"
${
built_products_plist
}
"
]]
;
then
EchoError
"error:
${
INFOPLIST_PATH
}
does not exist. The Flutter
\"
Thin Binary
\"
build phase must run after
\"
Copy Bundle Resources
\"
."
# Very occasionally Xcode hasn't created an Info.plist when this runs.
exit
-1
# The file will be present on re-run.
echo
"
${
INFOPLIST_PATH
}
does not exist. Skipping _dartobservatory._tcp NSBonjourServices insertion. Try re-building to enable
\"
flutter attach
\"
."
return
fi
fi
# If there are already NSBonjourServices specified by the app (uncommon), insert the observatory service name to the existing list.
# If there are already NSBonjourServices specified by the app (uncommon), insert the observatory service name to the existing list.
if
plutil
-extract
NSBonjourServices xml1
-o
-
"
${
built_products_plist
}
"
;
then
if
plutil
-extract
NSBonjourServices xml1
-o
-
"
${
built_products_plist
}
"
;
then
...
...
packages/flutter_tools/test/integration.shard/xcode_backend_test.dart
View file @
d0a29dc1
...
@@ -96,7 +96,7 @@ void main() {
...
@@ -96,7 +96,7 @@ void main() {
infoPlist
=
buildDirectory
.
childFile
(
'Info.plist'
);
infoPlist
=
buildDirectory
.
childFile
(
'Info.plist'
);
});
});
test
(
'
fail
s when the Info.plist is missing'
,
()
async
{
test
(
'
handle
s when the Info.plist is missing'
,
()
async
{
final
ProcessResult
result
=
await
Process
.
run
(
final
ProcessResult
result
=
await
Process
.
run
(
xcodeBackendPath
,
xcodeBackendPath
,
<
String
>[
'test_observatory_bonjour_service'
],
<
String
>[
'test_observatory_bonjour_service'
],
...
@@ -106,8 +106,8 @@ void main() {
...
@@ -106,8 +106,8 @@ void main() {
'INFOPLIST_PATH'
:
'Info.plist'
,
'INFOPLIST_PATH'
:
'Info.plist'
,
},
},
);
);
expect
(
result
.
std
err
,
startsWith
(
'error:
Info.plist does not exist.'
));
expect
(
result
.
std
out
,
contains
(
'
Info.plist does not exist.'
));
expect
(
result
.
exitCode
,
isNot
(
0
)
);
expect
(
result
.
exitCode
,
0
);
});
});
const
String
emptyPlist
=
'''
const
String
emptyPlist
=
'''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment