Skip to content

Commit 5903c2f

Browse files
committed
x64 test
1 parent 38b37a7 commit 5903c2f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

engine/src/flutter/ci/tizen/build_llvm.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ for name in ar readelf nm strip; do
4343
ln -sf llvm-$name arm-linux-gnueabi-$name
4444
ln -sf llvm-$name aarch64-linux-gnu-$name
4545
ln -sf llvm-$name i686-linux-gnu-$name
46+
ln -sf llvm-$name x86_64-linux-gnu-$name
4647
done

engine/src/flutter/ci/tizen/generate_sysroot.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
3838
tizen_arch = 'aarch64'
3939
elif arch == 'x86':
4040
tizen_arch = 'i686'
41+
elif arch == 'x64':
42+
tizen_arch = 'x86_64'
4143
else:
4244
sys.exit('Unknown arch: ' + arch)
4345

4446
base_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Base/latest/repos/standard/packages'.format(
4547
api_version, api_version
4648
)
47-
unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Unified/latest/repos/standard/packages'.format(
49+
unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Unified/latest/repos/emulator/packages'.format(
4850
api_version, api_version
4951
)
5052

@@ -91,11 +93,11 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
9193
if not asm.exists():
9294
os.symlink('asm-' + arch, asm)
9395
pkgconfig = sysroot / 'usr' / 'lib' / 'pkgconfig'
94-
if arch == 'arm64' and not pkgconfig.exists():
96+
if (arch == 'arm64' or arch == 'x64') and not pkgconfig.exists():
9597
os.symlink('../lib64/pkgconfig', pkgconfig)
9698

9799
# Copy objects required by the linker, such as crtbeginS.o and libgcc.a.
98-
if arch == 'arm64':
100+
if arch == 'arm64' or arch == 'x64':
99101
libpath = sysroot / 'usr' / 'lib64'
100102
else:
101103
libpath = sysroot / 'usr' / 'lib'
@@ -135,7 +137,7 @@ def main():
135137
outpath = Path(__file__).parent / 'sysroot'
136138
outpath.mkdir(exist_ok=True)
137139

138-
for arch in ['arm', 'arm64', 'x86']:
140+
for arch in ['x64']:
139141
sysroot = outpath / arch
140142
if args.force and sysroot.is_dir():
141143
shutil.rmtree(sysroot)

engine/src/flutter/testing/testing.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ is_aot_test =
1414
# * is_mac: arm64 builds can run x64 binaries.
1515
# * is_fuchsia: build unittests for testing on device.
1616
declare_args() {
17-
enable_unittests = current_toolchain == host_toolchain || is_fuchsia || is_mac
17+
enable_unittests = false # current_toolchain == host_toolchain || is_fuchsia || is_mac
1818
}
1919

2020
# Creates a translation unit that defines the flutter::testing::GetFixturesPath

0 commit comments

Comments
 (0)