From 076d39073d4faa1f4054242f6862795fdee66c6f Mon Sep 17 00:00:00 2001
From: Gustavo Grieco <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 30 Apr 2019 11:48:10 -0300
Subject: [PATCH 1/5] Update .travis.yml

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dadc10af..3d24baec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,11 @@ language: python
 python:
   - 3.6.5
 install:
+
+- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key -y add -
+- sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
 - sudo apt-get -y update
-- sudo apt-get -y install build-essential gcc-multilib cmake python3-pip python3-setuptools libffi-dev python3-nose
+- sudo apt-get -y install build-essential gcc-multilib clang-6.0 cmake python3-pip python3-setuptools libffi-dev python3-nose
 - pip3 install pip
 - pip3.6 -V
 - pip3.6 install pyflakes
@@ -13,7 +16,7 @@ install:
 - pip3.6 install https://github.com/trailofbits/manticore/archive/master.zip
 - mkdir build
 - cd build
-- cmake ..
+- CC=clang-6.0 CXX=clang++-6.0 cmake ..
 - sudo make install
 - cd ..
 env:

From 4fd8f9bb4ef6e26f117defb23b5e0024e33fa09a Mon Sep 17 00:00:00 2001
From: Gustavo Grieco <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 30 Apr 2019 11:52:44 -0300
Subject: [PATCH 2/5] Update .travis.yml

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3d24baec..9b1af93c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,8 @@ python:
   - 3.6.5
 install:
 
-- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key -y add -
+- wget -O llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key 
+- sudo apt-key -y add llvm-snapshot.gpg.key
 - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib clang-6.0 cmake python3-pip python3-setuptools libffi-dev python3-nose

From 4e477284752f71388103007ce2344f59d85ddacf Mon Sep 17 00:00:00 2001
From: Gustavo Grieco <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 30 Apr 2019 12:00:23 -0300
Subject: [PATCH 3/5] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9b1af93c..02b8383a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
 install:
 
 - wget -O llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key 
-- sudo apt-key -y add llvm-snapshot.gpg.key
+- sudo apt-key add llvm-snapshot.gpg.key
 - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib clang-6.0 cmake python3-pip python3-setuptools libffi-dev python3-nose

From 0edccf9254339f752bd6b601bc0c5bcd65503558 Mon Sep 17 00:00:00 2001
From: Gustavo Grieco <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 30 Apr 2019 12:23:16 -0300
Subject: [PATCH 4/5] Enable Lists for Manticore [skip ci]

---
 tests/test_lists.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_lists.py b/tests/test_lists.py
index 2c0b9db6..ef1ff428 100644
--- a/tests/test_lists.py
+++ b/tests/test_lists.py
@@ -5,8 +5,8 @@
 
 class ListsTest(deepstate_base.DeepStateTestCase):
   def run_deepstate(self, deepstate):
-    if deepstate == "deepstate-manticore":
-       return # Just skip for now, we know it's too slow
+    #if deepstate == "deepstate-manticore":
+    #   return # Just skip for now, we know it's too slow
     (r, output) = logrun.logrun([deepstate, "build/examples/Lists"],
                   "deepstate.out", 3000)
     self.assertEqual(r, 0)

From 49fe4a3fb1a7b02795462bb6f208896c7b604107 Mon Sep 17 00:00:00 2001
From: Gustavo Grieco <31542053+ggrieco-tob@users.noreply.github.com>
Date: Tue, 30 Apr 2019 12:24:30 -0300
Subject: [PATCH 5/5] Enable Runlen in Manticore

---
 tests/test_runlen.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_runlen.py b/tests/test_runlen.py
index 7a7e3e99..33d3818d 100644
--- a/tests/test_runlen.py
+++ b/tests/test_runlen.py
@@ -5,8 +5,8 @@
 
 class RunlenTest(deepstate_base.DeepStateTestCase):
   def run_deepstate(self, deepstate):
-    if deepstate == "deepstate-manticore":
-       return # Just skip for now, we know it's too slow    
+    #if deepstate == "deepstate-manticore":
+    #   return # Just skip for now, we know it's too slow    
     (r, output) = logrun.logrun([deepstate, "build/examples/Runlen"],
                   "deepstate.out", 2900)
     self.assertEqual(r, 0)