travis : a64: remove docker; dont fuzz against unicorn
This commit is contained in:
parent
d0c69355fb
commit
47e508dd12
12
.travis.yml
12
.travis.yml
@ -32,14 +32,18 @@ matrix:
|
|||||||
script: ./.travis/build-x86_64-linux/build.sh
|
script: ./.travis/build-x86_64-linux/build.sh
|
||||||
- env: NAME="Linux aarch64 Build"
|
- env: NAME="Linux aarch64 Build"
|
||||||
os: linux
|
os: linux
|
||||||
dist: trusty
|
dist: bionic
|
||||||
sudo: required
|
|
||||||
services: docker
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
script: ./.travis/build-aarch64-linux/run.sh
|
packages:
|
||||||
|
- gcc-8-aarch64-linux-gnu
|
||||||
|
- g++-8-aarch64-linux-gnu
|
||||||
|
- ninja-build
|
||||||
|
- qemu-user
|
||||||
|
install: ./.travis/build-aarch64-linux/deps.sh
|
||||||
|
script: ./.travis/build-aarch64-linux/build.sh
|
||||||
- env: NAME="macOS Build"
|
- env: NAME="macOS Build"
|
||||||
os: osx
|
os: osx
|
||||||
sudo: false
|
sudo: false
|
||||||
|
@ -3,12 +3,11 @@
|
|||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
|
export CC=aarch64-linux-gnu-gcc-8
|
||||||
export UNICORNDIR=$(pwd)/dynarmic/externals/unicorn
|
export CXX=aarch64-linux-gnu-g++-8
|
||||||
|
|
||||||
cd dynarmic
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -DDYNARMIC_TESTS_USE_UNICORN=1 -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-8 -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-8 -G Ninja
|
cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -G Ninja
|
||||||
ninja
|
ninja
|
||||||
|
|
||||||
qemu-aarch64 -L /usr/aarch64-linux-gnu ./tests/dynarmic_tests -d yes
|
qemu-aarch64 -L /usr/aarch64-linux-gnu ./tests/dynarmic_tests -d yes
|
||||||
|
@ -3,14 +3,7 @@
|
|||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y git cmake gcc python ninja-build g++-8-aarch64-linux-gnu qemu-user
|
|
||||||
|
|
||||||
# TODO: This isn't ideal.
|
# TODO: This isn't ideal.
|
||||||
cd dynarmic/externals
|
cd externals
|
||||||
git clone https://github.com/MerryMage/ext-boost
|
git clone https://github.com/MerryMage/ext-boost
|
||||||
git clone https://github.com/unicorn-engine/unicorn.git
|
cd ..
|
||||||
|
|
||||||
cd unicorn
|
|
||||||
UNICORN_ARCHS="arm aarch64" CC=aarch64-linux-gnu-gcc-8 ./make.sh
|
|
||||||
cd ../..
|
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
dynarmic/.travis/build-aarch64-linux/deps.sh
|
|
||||||
dynarmic/.travis/build-aarch64-linux/build.sh
|
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
docker pull ubuntu:18.04
|
|
||||||
docker run -v $(pwd):/dynarmic ubuntu:18.04 dynarmic/.travis/build-aarch64-linux/docker.sh
|
|
Loading…
x
Reference in New Issue
Block a user