From a3c4560d283101f973b2dd6e3b4b133d636e414b Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 09:11:57 -0300
Subject: [PATCH 1/9] Fixed python-nose

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

diff --git a/.travis.yml b/.travis.yml
index a193f22..a466da6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ sudo: true
 #- "2.7"
 install:
 - sudo apt-get -y update
-- sudo apt-get -y install build-essential gcc-multilib cmake python3 python3-pip python3-setuptools libffi-dev python3-nose
+- sudo apt-get -y install build-essential gcc-multilib cmake python3 python3-pip python3-setuptools libffi-dev python-nose
 - pip3 install pyflakes --user
 - pip3 install angr --user
 - pip3 install manticore --user

From 0ac3c733baeb82b6ebe52fe7e1f8397aae7178ea Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 09:28:23 -0300
Subject: [PATCH 2/9] Update .travis.yml

---
 .travis.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a466da6..26625a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ sudo: true
 #- "2.7"
 install:
 - sudo apt-get -y update
-- sudo apt-get -y install build-essential gcc-multilib cmake python3 python3-pip python3-setuptools libffi-dev python-nose
+- sudo apt-get -y install build-essential gcc-multilib cmake python3 python3-pip python3-setuptools libffi-dev python3-nose
 - pip3 install pyflakes --user
 - pip3 install angr --user
 - pip3 install manticore --user
@@ -29,15 +29,15 @@ env:
 script:
 - pyflakes bin/deepstate/*.py
 - pyflakes tests/*.py
-- if [ $TASK = ARITHMETIC ]; then nosetests tests/test_arithmetic.py ; fi
-- if [ $TASK = CRASH ]; then nosetests tests/test_crash.py ; fi
-- if [ $TASK = FIXTURE ]; then nosetests tests/test_fixture.py ; fi
-- if [ $TASK = KLEE ]; then nosetests tests/test_klee.py ; fi
-- if [ $TASK = LISTS ]; then nosetests tests/test_lists.py ; fi
-- if [ $TASK = ONEOF ]; then nosetests tests/test_oneof.py ; fi
-- if [ $TASK = RUNLEN ]; then nosetests tests/test_runlen.py ; fi
-- if [ $TASK = OVERFLOW ]; then nosetests tests/test_overflow.py ; fi
-- if [ $TASK = PRIMES ]; then nosetests tests/test_primes.py ; fi
-- if [ $TASK = STREAMINGANDFORMATTING ]; then nosetests tests/test_streamingandformatting.py ; fi
-- if [ $TASK = TAKEOVER ]; then nosetests tests/test_takeover.py ; fi
+- if [ $TASK = ARITHMETIC ]; then nosetests3 tests/test_arithmetic.py ; fi
+- if [ $TASK = CRASH ]; then nosetests3 tests/test_crash.py ; fi
+- if [ $TASK = FIXTURE ]; then nosetests3 tests/test_fixture.py ; fi
+- if [ $TASK = KLEE ]; then nosetests3 tests/test_klee.py ; fi
+- if [ $TASK = LISTS ]; then nosetests3 tests/test_lists.py ; fi
+- if [ $TASK = ONEOF ]; then nosetests3 tests/test_oneof.py ; fi
+- if [ $TASK = RUNLEN ]; then nosetests3 tests/test_runlen.py ; fi
+- if [ $TASK = OVERFLOW ]; then nosetests3 tests/test_overflow.py ; fi
+- if [ $TASK = PRIMES ]; then nosetests3 tests/test_primes.py ; fi
+- if [ $TASK = STREAMINGANDFORMATTING ]; then nosetests3 tests/test_streamingandformatting.py ; fi
+- if [ $TASK = TAKEOVER ]; then nosetests3 tests/test_takeover.py ; fi
 

From e97c5fa1ee4db08f330566ccc13e6371d84ebf75 Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 10:22:52 -0300
Subject: [PATCH 3/9] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 448dfa7..3f9328a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ set(CMAKE_C_FLAGS_RELEASE "-O3")
 set(CMAKE_CXX_FLAGS_DEBUG "-O3")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
-find_program(PYTHON "python2.7")
+find_program(PYTHON "python3.6")
 
 # Enable the GNU extensions
 set(CMAKE_CXX_EXTENSIONS ON)

From bddaca59d521ef932da0b351309a5bfe7a299f93 Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 10:36:10 -0300
Subject: [PATCH 4/9] Upgrade to bionic (to use python3.6 from the official
 repositories)

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

diff --git a/.travis.yml b/.travis.yml
index 26625a5..9402fff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: bash
-dist: xenial
+dist: bionic
 sudo: true
 #python:
 #- "2.7"
 install:
 - sudo apt-get -y update
-- sudo apt-get -y install build-essential gcc-multilib cmake python3 python3-pip python3-setuptools libffi-dev python3-nose
+- sudo apt-get -y install build-essential gcc-multilib cmake python3.6 python3-pip python3-setuptools libffi-dev python3-nose
 - pip3 install pyflakes --user
 - pip3 install angr --user
 - pip3 install manticore --user

From 5e4980c212b135ac654d6344b03e3bcdad6a4095 Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 10:50:19 -0300
Subject: [PATCH 5/9] Update .travis.yml

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9402fff..694aea9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: bash
-dist: bionic
+dist: xenial
 sudo: true
-#python:
-#- "2.7"
+python:
+- "3.6.5"
 install:
 - sudo apt-get -y update
-- sudo apt-get -y install build-essential gcc-multilib cmake python3.6 python3-pip python3-setuptools libffi-dev python3-nose
+- sudo apt-get -y install build-essential gcc-multilib cmake python3-pip python3-setuptools libffi-dev python3-nose
 - pip3 install pyflakes --user
 - pip3 install angr --user
 - pip3 install manticore --user

From 317794bd38666c4afd5bab49edf78f821028d8c7 Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 11:15:09 -0300
Subject: [PATCH 6/9] Update .travis.yml

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 694aea9..2f18b6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,11 @@ python:
 install:
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python3-pip python3-setuptools libffi-dev python3-nose
-- pip3 install pyflakes --user
-- pip3 install angr --user
-- pip3 install manticore --user
+- pip3 install pip --user
+- pip3.6 -V
+- pip3.6 install pyflakes --user
+- pip3.6 install angr --user
+- pip3.6 install manticore --user
 - mkdir build
 - cd build
 - cmake ..

From b676147c7af5bd41535080fc41507cdc94999c2a Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 11:16:29 -0300
Subject: [PATCH 7/9] Update .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index 2f18b6f..95cb826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
-language: bash
 dist: xenial
 sudo: true
+language: python
 python:
-- "3.6.5"
+  - 3.6.5
 install:
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python3-pip python3-setuptools libffi-dev python3-nose

From 011639cea4bd03019db165022b3740ea2fa6b4ee Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 11:21:32 -0300
Subject: [PATCH 8/9] Update .travis.yml

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95cb826..d18d4d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,11 @@ python:
 install:
 - sudo apt-get -y update
 - sudo apt-get -y install build-essential gcc-multilib cmake python3-pip python3-setuptools libffi-dev python3-nose
-- pip3 install pip --user
+- pip3 install pip
 - pip3.6 -V
-- pip3.6 install pyflakes --user
-- pip3.6 install angr --user
-- pip3.6 install manticore --user
+- pip3.6 install pyflakes
+- pip3.6 install angr
+- pip3.6 install manticore
 - mkdir build
 - cd build
 - cmake ..

From 3ce73c78f477cebae8bdf3b159b1ba32a67dd95a Mon Sep 17 00:00:00 2001
From: ggrieco-tob <31542053+ggrieco-tob@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:24:09 -0300
Subject: [PATCH 9/9] Update main_manticore.py

---
 bin/deepstate/main_manticore.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/deepstate/main_manticore.py b/bin/deepstate/main_manticore.py
index 1d10e8e..0981e2c 100644
--- a/bin/deepstate/main_manticore.py
+++ b/bin/deepstate/main_manticore.py
@@ -26,7 +26,6 @@ except Exception as e:
     sys.exit(255)
   else:
     raise
-import multiprocessing
 import traceback
 from .common import DeepState, TestInfo