From b07699bae7e70ab5f49efe196f194689509607e4 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Mon, 6 May 2019 00:32:22 +0100 Subject: [PATCH] travis: Rename test-a64 to test-with-unicorn Also remove [a64] filter so that the A32 frontend is exercised as well. --- .travis.yml | 4 ++-- .../build.sh | 2 +- .../deps.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename .travis/{test-a64-on-x86_64-linux => test-with-unicorn-on-x86_64-linux}/build.sh (88%) rename .travis/{test-a64-on-x86_64-linux => test-with-unicorn-on-x86_64-linux}/deps.sh (89%) diff --git a/.travis.yml b/.travis.yml index bc944572..995d9c12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ matrix: - g++-7 - llvm-dev - ninja-build - install: ./.travis/test-a64-on-x86_64-linux/deps.sh - script: ./.travis/test-a64-on-x86_64-linux/build.sh + install: ./.travis/test-with-unicorn-on-x86_64-linux/deps.sh + script: ./.travis/test-with-unicorn-on-x86_64-linux/build.sh - env: NAME="Test - SSE3 only" os: linux dist: trusty diff --git a/.travis/test-a64-on-x86_64-linux/build.sh b/.travis/test-with-unicorn-on-x86_64-linux/build.sh similarity index 88% rename from .travis/test-a64-on-x86_64-linux/build.sh rename to .travis/test-with-unicorn-on-x86_64-linux/build.sh index dd5c5547..05ac2c68 100755 --- a/.travis/test-a64-on-x86_64-linux/build.sh +++ b/.travis/test-with-unicorn-on-x86_64-linux/build.sh @@ -12,4 +12,4 @@ mkdir build && cd build cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -DDYNARMIC_USE_LLVM=1 -DDYNARMIC_TESTS_USE_UNICORN=1 -G Ninja ninja -./tests/dynarmic_tests --durations yes [a64] +./tests/dynarmic_tests --durations yes diff --git a/.travis/test-a64-on-x86_64-linux/deps.sh b/.travis/test-with-unicorn-on-x86_64-linux/deps.sh similarity index 89% rename from .travis/test-a64-on-x86_64-linux/deps.sh rename to .travis/test-with-unicorn-on-x86_64-linux/deps.sh index a4510d49..10f98b4d 100755 --- a/.travis/test-a64-on-x86_64-linux/deps.sh +++ b/.travis/test-with-unicorn-on-x86_64-linux/deps.sh @@ -8,7 +8,7 @@ cd externals git clone https://github.com/MerryMage/ext-boost git clone https://github.com/yuzu-emu/unicorn cd unicorn -UNICORN_ARCHS=aarch64 ./make.sh +UNICORN_ARCHS="arm aarch64" ./make.sh cd ../.. mkdir -p $HOME/.local