Merge pull request #84 from zardus/wip/tests

Wip/tests

.travis.yml

@@ -2,10 +2,11 @@ language: bash
 sudo: required
 dist: trusty
 env:
-- PATH=$TRAVIS_BUILD_DIR/bin:$PATH
+- PATH=$TRAVIS_BUILD_DIR/bin:$PATH SUITE="all" OPTS="-s"
+- PATH=$TRAVIS_BUILD_DIR/bin:$PATH SUITE="z3" OPTS="-s -v -f"
+- PATH=$TRAVIS_BUILD_DIR/bin:$PATH SUITE="qemu" OPTS="-s -f -v"
+- PATH=$TRAVIS_BUILD_DIR/bin:$PATH SUITE="qira" OPTS="-s -f"
+- PATH=$TRAVIS_BUILD_DIR/bin:$PATH SUITE="afl" OPTS="-s -f"
 install: (sudo apt-get update || true) && bin/manage-tools -s setup
 script:
-- VIRTUALENVWRAPPER_SCRIPT=/usr/share/virtualenvwrapper/virtualenvwrapper.sh manage-tools -s -v test z3
-- VIRTUALENVWRAPPER_SCRIPT=/usr/share/virtualenvwrapper/virtualenvwrapper.sh manage-tools -s -v test qemu
-- VIRTUALENVWRAPPER_SCRIPT=/usr/share/virtualenvwrapper/virtualenvwrapper.sh manage-tools -s -v test qira
-- VIRTUALENVWRAPPER_SCRIPT=/usr/share/virtualenvwrapper/virtualenvwrapper.sh manage-tools -s -v test all
+- VIRTUALENVWRAPPER_SCRIPT=/usr/share/virtualenvwrapper/virtualenvwrapper.sh manage-tools $OPTS test $SUITE

README.md

@@ -9,7 +9,7 @@ Installers for the following tools are included:
 
 | Category | Tool | Description |
 |----------|------|-------------|
-| binary | [afl](http://lcamtuf.coredump.cx/afl/) | State-of-the-art fuzzer. | <!--tool--> <!--test-->
+| binary | [afl](http://lcamtuf.coredump.cx/afl/) | State-of-the-art fuzzer. | <!--tool--> <!--times-out-->
 | binary | [angr](http://angr.io) | Next-generation binary analysis engine from Shellphish. | <!--tool--> <!--no-test-->
 | binary | [barf](https://github.com/programa-stic/barf-project) | Binary Analysis and Reverse-engineering Framework. | <!--tool--><!--times-out-->
 | binary | [bindead](https://bitbucket.org/mihaila/bindead/wiki/Home) | A static analysis tool for binaries. | <!--tool--><!--failing-->
@@ -33,7 +33,7 @@ Installers for the following tools are included:
 | binary | [pwntools](https://github.com/Gallopsled/pwntools) | Useful CTF utilities. | <!--tool--><!--no-test-->
 | binary | [python-pin](https://github.com/blankwall/Python_Pin) | Python bindings for pin. | <!--tool--><!--test-->
 | binary | [qemu](http://qemu.org) | Latest version of qemu! | <!--tool--><!--times-out-->
-| binary | [qira](http://qira.me) | Parallel, timeless debugger. | <!--tool--><!--test-->
+| binary | [qira](http://qira.me) | Parallel, timeless debugger. | <!--tool--><!--times-out-->
 | binary | [radare2](http://www.radare.org/) | Some crazy thing crowell likes. | <!--tool--><!--test-->
 | binary | [ropper](https://github.com/sashs/Ropper) | Another gadget finder. | <!--tool--><!--test-->
 | binary | [rp++](https://github.com/0vercl0k/rp) | Another gadget finder. | <!--tool--><!--test-->
@@ -83,7 +83,7 @@ Installers for the following tools are included:
 | stego | [stegsolve](http://www.caesum.com/handbook/stego.htm) | Image steganography solver. | <!--tool--><!--test-->
 | android | [apktool](https://ibotpeaches.github.io/Apktool/) | Dissect, dis-assemble, and re-pack Android APKs | <!--tool--><!--test-->
 | android | [android-sdk](http://developer.android.com/sdk) | The android SDK (adb, emulator, etc). | <!--tool--><!--no-test-->
-| misc | [z3](https://github.com/Z3Prover/z3) | Theorem prover from Microsoft Research. | <!--tool--><!--test-->
+| misc | [z3](https://github.com/Z3Prover/z3) | Theorem prover from Microsoft Research. | <!--tool--><!--times-out-->
 
 There are also some installers for non-CTF stuff to break the monotony!
 

bin/manage-tools

@@ -10,6 +10,7 @@ Usage: $(basename $0) [-sv] (list|setup|install|uninstall|bin|search) tool
 Where:
     -s      allow running things with sudo (i.e., to install debs)
     -v      verbose mode. print log while installing
+    -f      force certain actions (such as installing over an installed tool)
     tool    the name of the tool. if "all", does the action on all tools
 
 Actions:
@@ -159,6 +160,9 @@ do
 		-s)
 			export ALLOW_SUDO=1
 			;;
+		-f)
+			export FORCE=1
+			;;
 		-v)
 			export VERBOSE_OUTPUT=1
 			;;
@@ -171,6 +175,7 @@ do
 done
 
 [[ -z ${ALLOW_SUDO+x} ]] && export ALLOW_SUDO=0
+[[ -z ${FORCE+x} ]] && export FORCE=0
 [[ -z ${VERBOSE_OUTPUT+x} ]] && export VERBOSE_OUTPUT=0
 
 if [[ $# -ge 1 ]]; then
@@ -218,7 +223,7 @@ case $ACTION in
 		;;
 	install)
 		cd $TOOL
-		if git status --ignored . | egrep -q 'Untracked|Ignored'
+		if [ "$FORCE" -eq 0 ] && git status --ignored . | egrep -q 'Untracked|Ignored'
 		then
 			tool_log "appears to already be installed. Uninstall first?"
 			exit 0
@@ -297,7 +302,7 @@ case $ACTION in
 		cat README.md | grep "<\!--tool-->" | sed "s/<\!--[^-]*-->//g" | grep -i "$TOOL"
 		;;
 	test)
-		if ! cat README.md | grep "<\!--tool-->" | grep "| \[$TOOL\](" | grep -q -- "--test--"
+		if [ "$FORCE" -eq 0 ] && ! cat README.md | grep "<\!--tool-->" | grep "| \[$TOOL\](" | grep -q -- "--test--"
 		then
 			tool_log "Tests not enabled."
 		else