aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbloodstalker <thabogre@gmail.com>2018-04-30 23:07:46 +0000
committerbloodstalker <thabogre@gmail.com>2018-04-30 23:07:46 +0000
commit032364144c0c794d0f96d7005ba8aa81ea15584b (patch)
tree914f69e167864d11eb5cc36e9817aab989ffe193
parentfixes #30. run make deepclean on bruiser. lua needs to be rebuilt. added a ne... (diff)
downloadmutator-032364144c0c794d0f96d7005ba8aa81ea15584b.tar.gz
mutator-032364144c0c794d0f96d7005ba8aa81ea15584b.zip
fixing travis
-rw-r--r--.travis.yml4
-rw-r--r--bruiser/bruiser.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 71cdc4c..b57b6ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,8 @@ before_script:
- travis_retry sudo apt-get install clang-5.0 libclang-5.0-dev libclang-common-5.0-dev libllvm5.0 llvm-5.0-dev llvm-5.0 llvm-5.0-runtime libclang1-5.0-dbg libllvm5.0-dbg lldb-5.0 -y
- sudo apt-get install gcc-4.9 g++-4.9
- sudo apt-get install libffi-dev -y
+ - sudo apt-get install luarocks -y
+ - luarocks install ansicolors
- ./extra-tools/capstoneubuntu14.sh
- ./extra-tools/keystoneubuntu.sh
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
@@ -50,12 +52,12 @@ before_script:
script:
- make PY_CONF=python3.5-config CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG -j2
- - cd ./extra-tools && ./precommitTests.sh
after_failure:
- find . -maxdepth 1 -name "core*"
after_success:
+ - cd ./extra-tools && ./precommitTests.sh
- llvm-config-4.0 --has-rtti
- llvm-config-5.0 --has-rtti
- gcc -v
diff --git a/bruiser/bruiser.cpp b/bruiser/bruiser.cpp
index 340d29d..529cb75 100644
--- a/bruiser/bruiser.cpp
+++ b/bruiser/bruiser.cpp
@@ -2276,7 +2276,7 @@ int main(int argc, const char **argv) {
if (strcmp(argv[i], "--verbose") == 0) {Verbose = true; continue;}
if (strcmp(argv[i], "--keepalive") == 0) {KEEPALIVE = true; continue;}
if (strcmp(argv[i], "--lua") == 0) {NonCLILuaScript = argv[i+1]; argc_n--; continue;}
- if (strcmp(argv[i], "--luadefault") == 0) {LuaDefault = argv[i+1]; argc_n; continue;}
+ if (strcmp(argv[i], "--luadefault") == 0) {LuaDefault = argv[i+1]; argc_n--; continue;}
argv_n.push_back(argv[i]);
argc_n++;
}