diff --git a/.travis.yml b/.travis.yml index 8cf96bdf..e9a694ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,17 @@ -language: python -python: 2.7 -install: ./install.sh +language: + - python + +python: + - 2.7 + +install: + # g++4.8.1 + - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi + - ./install.sh + script: + - $CXX --version - ./run_tests.sh - ./run_tests_static.sh diff --git a/ida/bin/qira_ida66_linux.plx b/ida/bin/qira_ida66_linux.plx index b852a2c3..d61716f6 100755 Binary files a/ida/bin/qira_ida66_linux.plx and b/ida/bin/qira_ida66_linux.plx differ diff --git a/qiradb/qiradb/Trace.cpp b/qiradb/qiradb/Trace.cpp index 2580b8b8..3e325446 100644 --- a/qiradb/qiradb/Trace.cpp +++ b/qiradb/qiradb/Trace.cpp @@ -1,5 +1,8 @@ #include #include +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif #include #ifndef _WIN32 diff --git a/tracers/qemu_build.sh b/tracers/qemu_build.sh index 21fb76e4..0c628356 100755 --- a/tracers/qemu_build.sh +++ b/tracers/qemu_build.sh @@ -26,7 +26,7 @@ if [ ! -d qemu/qemu-latest ]; then wget http://wiki.qemu-project.org/download/qemu-$QEMU_VERSION.tar.bz2 HASH=`sha256sum ./qemu-"$QEMU_VERSION".tar.bz2 2>/dev/null | cut -d' ' -f1` - + if [ "$HASH" != "$QEMU_SHA256" ]; then echo "Error: qemu-"$QEMU_VERSION".tar.bz2 has an invalid checksum." exit 1