Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
79e0d26e
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
79e0d26e
编写于
4月 26, 2021
作者:
D
Dan Field
提交者:
GitHub
4月 26, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get FTL test running again (#25771)
上级
b56fa627
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
28 deletion
+19
-28
ci/firebase_testlab.sh
ci/firebase_testlab.sh
+3
-17
testing/scenario_app/android/app/src/main/AndroidManifest.xml
...ing/scenario_app/android/app/src/main/AndroidManifest.xml
+0
-5
testing/scenario_app/android/build.gradle
testing/scenario_app/android/build.gradle
+1
-1
testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties
...ario_app/android/gradle/wrapper/gradle-wrapper.properties
+1
-1
testing/scenario_app/assemble_apk.sh
testing/scenario_app/assemble_apk.sh
+5
-1
testing/scenario_app/compile_android_aot.sh
testing/scenario_app/compile_android_aot.sh
+9
-3
未找到文件。
ci/firebase_testlab.sh
浏览文件 @
79e0d26e
...
...
@@ -18,22 +18,7 @@ if [[ ! -f "$APP" ]]; then
fi
GIT_REVISION
=
"
${
2
:-
$(
git rev-parse HEAD
)
}
"
BUILD_ID
=
"
${
3
:-
$CIRRUS_BUILD_ID
}
"
if
[[
-n
$GCLOUD_FIREBASE_TESTLAB_KEY
]]
;
then
# New contributors will not have permissions to run this test - they won't be
# able to access the service account information. We should just mark the test
# as passed - it will run fine on post submit, where it will still catch
# failures.
# We can also still make sure that building a release app bundle still works.
if
[[
$GCLOUD_FIREBASE_TESTLAB_KEY
==
ENCRYPTED
*
]]
;
then
echo
"This user does not have permission to run this test."
exit
0
fi
echo
"
$GCLOUD_FIREBASE_TESTLAB_KEY
"
>
"
${
HOME
}
/gcloud-service-key.json"
gcloud auth activate-service-account
--key-file
=
"
${
HOME
}
/gcloud-service-key.json"
fi
BUILD_ID
=
"
${
3
:-
$SWARMING_TASK_ID
}
"
# Run the test.
# game-loop tests are meant for OpenGL apps.
...
...
@@ -46,4 +31,5 @@ gcloud --project flutter-infra firebase test android run \
--timeout
2m
\
--results-bucket
=
gs://flutter_firebase_testlab
\
--results-dir
=
"engine_scenario_test/
$GIT_REVISION
/
$BUILD_ID
"
\
--no-auto-google-login
# Pixel 4. As of this commit, this is a highly available device in FTL.
--device
model
=
flame,version
=
29
testing/scenario_app/android/app/src/main/AndroidManifest.xml
浏览文件 @
79e0d26e
...
...
@@ -33,11 +33,6 @@
android:launchMode=
"singleTop"
android:windowSoftInputMode=
"adjustResize"
android:theme=
"@style/FullScreenScreenshot"
>
<intent-filter>
<action
android:name=
"com.google.intent.action.TEST_LOOP"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<data
android:mimeType=
"application/javascript"
/>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
testing/scenario_app/android/build.gradle
浏览文件 @
79e0d26e
...
...
@@ -6,7 +6,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:
3.6
.0'
classpath
'com.android.tools.build:gradle:
4.1
.0'
classpath
'com.facebook.testing.screenshot:plugin:0.12.0'
// NOTE: Do not place your application dependencies here; they belong
...
...
testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties
浏览文件 @
79e0d26e
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
5.6.4-all
.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
6.5-bin
.zip
testing/scenario_app/assemble_apk.sh
浏览文件 @
79e0d26e
...
...
@@ -28,7 +28,7 @@ SRC_DIR="$(cd "$SCRIPT_DIR/../../.."; pwd -P)"
export
ANDROID_HOME
=
"
$SRC_DIR
/third_party/android_tools/sdk"
"
$SRC_DIR
/flutter/tools/gn"
--unopt
autoninja
-C
"
$SRC_DIR
/out/host_debug_unopt"
sky_engine sky_services
ninja
-C
"
$SRC_DIR
/out/host_debug_unopt"
sky_engine sky_services
-j
400
"
$SCRIPT_DIR
/compile_android_aot.sh"
"
$1
"
"
$2
"
...
...
@@ -36,3 +36,7 @@ autoninja -C "$SRC_DIR/out/host_debug_unopt" sky_engine sky_services
cd
"
$SCRIPT_DIR
/android"
./gradlew assembleDebug
--no-daemon
)
# LUCI expects to find the APK here
mkdir
-p
"
$SCRIPT_DIR
/android/app/build/outputs/apk/debug"
cp
"
$SCRIPT_DIR
/build/app/outputs/apk/debug/app-debug.apk"
"
$SCRIPT_DIR
/android/app/build/outputs/apk/debug"
testing/scenario_app/compile_android_aot.sh
浏览文件 @
79e0d26e
...
...
@@ -41,7 +41,7 @@ fi
if
[[
!
-d
"
$DEVICE_TOOLS
"
]]
;
then
echo
"Directory
$DEVICE_TOOLS
not found."
e
hc
o
"Second argument must specify the device out directory containing gen_snapshot (e.g. out/android_debug_unopt_x64/clang_x64)."
e
ch
o
"Second argument must specify the device out directory containing gen_snapshot (e.g. out/android_debug_unopt_x64/clang_x64)."
exit
1
fi
...
...
@@ -61,16 +61,22 @@ mkdir -p "$OUTDIR"
echo
"Compiling kernel..."
# --disable-dart-dev: No need for observatory/DDS.
# --no-print-incremental-dependencies: Avoid printing out a lot of verbosity that doesn't help this test.
"
$HOST_TOOLS
/dart"
\
--disable-dart-dev
\
"
$HOST_TOOLS
/gen/frontend_server.dart.snapshot"
\
--sdk-root
"
$HOST_TOOLS
/flutter_patched_sdk"
\
--aot
--tfa
--target
=
flutter
\
--target
=
flutter
\
--no-print-incremental-dependencies
\
--aot
\
--tfa
\
--output-dill
"
$OUTDIR
/app.dill"
\
"
$SCRIPT_DIR
/lib/main.dart"
echo
"Compiling ELF Shared Library..."
"
$
HOST
_TOOLS
/gen_snapshot"
--deterministic
--snapshot_kind
=
app-aot-elf
--elf
=
"
$OUTDIR
/libapp.so"
--strip
"
$OUTDIR
/app.dill"
"
$
DEVICE
_TOOLS
/gen_snapshot"
--deterministic
--snapshot_kind
=
app-aot-elf
--elf
=
"
$OUTDIR
/libapp.so"
--strip
"
$OUTDIR
/app.dill"
mkdir
-p
"
$SCRIPT_DIR
/android/app/src/main/jniLibs/arm64-v8a"
mkdir
-p
"
$SCRIPT_DIR
/android/app/libs"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录