From fb2dc2f55cd16c4733aa00bd2b893a15a89fb75f Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:00:17 +0100
Subject: [PATCH] travis: Re-enable most tests

---
 .travis.yml                                   | 58 ++++++++++---------
 .travis/sse3-only-on-x86_64-linux/build.sh    |  2 +-
 .../build.sh                                  |  2 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e202417..b86c9f50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,31 +36,33 @@ matrix:
       osx_image: xcode10.2
       install: ./.travis/build-x86_64-macos/deps.sh
       script: ./.travis/build-x86_64-macos/build.sh
-#    - env: NAME="Test - Fuzz against Unicorn"
-#      os: linux
-#      dist: trusty
-#      addons:
-#        apt:
-#          sources:
-#            - ubuntu-toolchain-r-test
-#          packages:
-#            - gcc-7
-#            - g++-7
-#            - llvm-dev
-#            - ninja-build
-#      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
-#      addons:
-#        apt:
-#          sources:
-#            - ubuntu-toolchain-r-test
-#          packages:
-#            - gcc-7
-#            - g++-7
-#            - llvm-dev
-#            - ninja-build
-#      install: ./.travis/sse3-only-on-x86_64-linux/deps.sh
-#      script: ./.travis/sse3-only-on-x86_64-linux/build.sh
+    - env: NAME="Test - Fuzz against Unicorn"
+      os: linux
+      dist: trusty
+      python: "3.8"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-7
+            - g++-7
+            - llvm-dev
+            - ninja-build
+      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
+      python: "3.8"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-7
+            - g++-7
+            - llvm-dev
+            - ninja-build
+      install: ./.travis/sse3-only-on-x86_64-linux/deps.sh
+      script: ./.travis/sse3-only-on-x86_64-linux/build.sh
diff --git a/.travis/sse3-only-on-x86_64-linux/build.sh b/.travis/sse3-only-on-x86_64-linux/build.sh
index 7ca3fd2d..d647c794 100755
--- a/.travis/sse3-only-on-x86_64-linux/build.sh
+++ b/.travis/sse3-only-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 -DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=0 -G Ninja
 ninja
 
-./tests/dynarmic_tests --durations yes
+./tests/dynarmic_tests --durations yes "~A32:*" "~Fuzz Thumb instructions set 1"
diff --git a/.travis/test-with-unicorn-on-x86_64-linux/build.sh b/.travis/test-with-unicorn-on-x86_64-linux/build.sh
index 05ac2c68..f0385e8d 100755
--- a/.travis/test-with-unicorn-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
+./tests/dynarmic_tests --durations yes "~A32:*" "~Fuzz Thumb instructions set 1"