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
67e4aeb6
Unverified
Commit
67e4aeb6
authored
Jun 29, 2021
by
Christopher Fujino
Committed by
GitHub
Jun 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-enable codesign integration test (#85507)
parent
425c37da
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
22 deletions
+17
-22
codesign.dart
dev/conductor/lib/codesign.dart
+1
-1
globals.dart
dev/conductor/lib/globals.dart
+1
-17
codesign_integration_test.dart
dev/conductor/test/codesign_integration_test.dart
+15
-4
No files found.
dev/conductor/lib/codesign.dart
View file @
67e4aeb6
...
...
@@ -284,7 +284,7 @@ class CodesignCommand extends Command<void> {
// First print all deviations from expectations
if
(
unsignedBinaries
.
isNotEmpty
)
{
stdio
.
printError
(
'Found
${unsignedBinaries.length}
unsigned binaries:'
);
unsignedBinaries
.
forEach
(
print
);
unsignedBinaries
.
forEach
(
stdio
.
printError
);
}
if
(
wrongEntitlementBinaries
.
isNotEmpty
)
{
...
...
dev/conductor/lib/globals.dart
View file @
67e4aeb6
...
...
@@ -50,23 +50,7 @@ Directory get localFlutterRoot {
const
FileSystem
fileSystem
=
LocalFileSystem
();
const
Platform
platform
=
LocalPlatform
();
// If a test
if
(
platform
.
script
.
scheme
==
'data'
)
{
final
RegExp
pattern
=
RegExp
(
r'(file:\/\/[^"]*[/\\]dev\/conductor[/\\][^"]+\.dart)'
,
multiLine:
true
,
);
final
Match
?
match
=
pattern
.
firstMatch
(
Uri
.
decodeFull
(
platform
.
script
.
path
));
if
(
match
==
null
)
{
throw
Exception
(
'Cannot determine path of script!
\n
${platform.script.path}
'
,
);
}
filePath
=
Uri
.
parse
(
match
.
group
(
1
)!).
path
.
replaceAll
(
r'%20'
,
' '
);
}
else
{
filePath
=
platform
.
script
.
toFilePath
();
}
filePath
=
platform
.
script
.
toFilePath
();
final
String
checkoutsDirname
=
fileSystem
.
path
.
normalize
(
fileSystem
.
path
.
join
(
fileSystem
.
path
.
dirname
(
filePath
),
...
...
dev/conductor/test/codesign_integration_test.dart
View file @
67e4aeb6
...
...
@@ -31,9 +31,13 @@ void main() {
stdio:
stdio
,
);
final
Directory
flutterRoot
=
_flutterRootFromDartBinary
(
fileSystem
.
file
(
platform
.
executable
),
);
final
CommandRunner
<
void
>
runner
=
CommandRunner
<
void
>(
'codesign-test'
,
''
)
..
addCommand
(
CodesignCommand
(
checkouts:
checkouts
,
flutterRoot:
localF
lutterRoot
));
CodesignCommand
(
checkouts:
checkouts
,
flutterRoot:
f
lutterRoot
));
try
{
await
runner
.
run
(<
String
>[
...
...
@@ -44,7 +48,7 @@ void main() {
]);
}
on
ConductorException
catch
(
e
)
{
print
(
stdio
.
error
);
print
(
fixItInstructions
);
print
(
_
fixItInstructions
);
fail
(
e
.
message
);
}
on
Exception
{
print
(
'stdout:
\n
${stdio.stdout}
'
);
...
...
@@ -54,10 +58,17 @@ void main() {
},
onPlatform:
<
String
,
dynamic
>{
'windows'
:
const
Skip
(
'codesign command is only supported on macos'
),
'linux'
:
const
Skip
(
'codesign command is only supported on macos'
),
},
skip:
'TODO(christopherfujino): https://github.com/flutter/flutter/issues/83448'
);
});
}
Directory
_flutterRootFromDartBinary
(
File
dartBinary
)
{
final
Directory
flutterDartSdkDir
=
dartBinary
.
parent
.
parent
;
final
Directory
flutterCache
=
flutterDartSdkDir
.
parent
;
final
Directory
flutterSdkDir
=
flutterCache
.
parent
.
parent
;
return
flutterSdkDir
;
}
const
String
fixItInstructions
=
'''
const
String
_
fixItInstructions
=
'''
Codesign integration test failed.
This means that the binary files found in the Flutter cache do not match those
...
...
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