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
39155dcb
Unverified
Commit
39155dcb
authored
Nov 23, 2020
by
Jenn Magder
Committed by
GitHub
Nov 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make simulator framework test check explicit (#71100)
parent
89a7bf77
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
build_ios_framework_module_test.dart
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
+11
-11
No files found.
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
View file @
39155dcb
...
...
@@ -141,7 +141,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
aotSymbols
.
contains
(
'_kDartVmSnapshot'
))
{
throw
TaskResult
.
failure
(
'Debug App.framework contains AOT'
);
}
await
_checkFrameworkArchs
(
debugAppFrameworkPath
,
'Debug'
);
await
_checkFrameworkArchs
(
debugAppFrameworkPath
,
true
);
// Xcode changed the name of this generated directory in Xcode 12.
const
String
xcode11ArmDirectoryName
=
'ios-armv7_arm64'
;
...
...
@@ -193,7 +193,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'App'
,
);
await
_checkFrameworkArchs
(
appFrameworkPath
,
mod
e
);
await
_checkFrameworkArchs
(
appFrameworkPath
,
fals
e
);
await
_checkBitcode
(
appFrameworkPath
,
mode
);
final
String
aotSymbols
=
await
dylibSymbols
(
appFrameworkPath
);
...
...
@@ -239,7 +239,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'Flutter'
,
);
await
_checkFrameworkArchs
(
engineFrameworkPath
,
mode
);
await
_checkFrameworkArchs
(
engineFrameworkPath
,
mode
==
'Debug'
);
await
_checkBitcode
(
engineFrameworkPath
,
mode
);
checkFileExists
(
path
.
join
(
...
...
@@ -280,7 +280,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'device_info.framework'
,
'device_info'
,
);
await
_checkFrameworkArchs
(
pluginFrameworkPath
,
mode
);
await
_checkFrameworkArchs
(
pluginFrameworkPath
,
mode
==
'Debug'
);
await
_checkBitcode
(
pluginFrameworkPath
,
mode
);
checkFileExists
(
path
.
join
(
...
...
@@ -343,7 +343,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
'FlutterPluginRegistrant'
);
await
_checkFrameworkArchs
(
registrantFrameworkPath
,
mode
);
await
_checkFrameworkArchs
(
registrantFrameworkPath
,
mode
==
'Debug'
);
await
_checkBitcode
(
registrantFrameworkPath
,
mode
);
checkFileExists
(
path
.
join
(
...
...
@@ -450,24 +450,24 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
}
}
Future
<
void
>
_checkFrameworkArchs
(
String
frameworkPath
,
String
mode
)
async
{
Future
<
void
>
_checkFrameworkArchs
(
String
frameworkPath
,
bool
shouldContainSimulator
)
async
{
checkFileExists
(
frameworkPath
);
final
String
archs
=
await
fileType
(
frameworkPath
);
if
(!
archs
.
contains
(
'armv7'
))
{
throw
TaskResult
.
failure
(
'
$
mode
$
frameworkPath
armv7 architecture missing'
);
throw
TaskResult
.
failure
(
'
$frameworkPath
armv7 architecture missing'
);
}
if
(!
archs
.
contains
(
'arm64'
))
{
throw
TaskResult
.
failure
(
'
$
mode
$
frameworkPath
arm64 architecture missing'
);
throw
TaskResult
.
failure
(
'
$frameworkPath
arm64 architecture missing'
);
}
final
bool
containsSimulator
=
archs
.
contains
(
'x86_64'
);
final
bool
isDebug
=
mode
==
'Debug'
;
// Debug should contain the simulator archs.
// Release and Profile should not.
if
(
containsSimulator
!=
isDebug
)
{
throw
TaskResult
.
failure
(
'
$mode
$frameworkPath
x86_64 architecture
${isDebug ? 'missing' : 'present'}
'
);
if
(
containsSimulator
!=
shouldContainSimulator
)
{
throw
TaskResult
.
failure
(
'
$frameworkPath
x86_64 architecture
${shouldContainSimulator ? 'missing' : 'present'}
'
);
}
}
...
...
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