6 files changed, 38 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index d2d7010..4ca62b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ before_install:
 
 script:
   - make -j2
+  - make test
 
 deploy:
   provider: releases
diff --git a/Makefile b/Makefile
index 2f6e899..d48eba3 100644
--- a/Makefile
+++ b/Makefile
@@ -19,21 +19,26 @@ clean-all:
 docs:
 	doxygen Doxyfile
 
+test: all
+	+$(MAKE) -C test test
+
 help:
 	@echo "ecgen, tool for generating Elliptic curve domain parameters"
 	@echo
 	@echo "Available targets:"
 	@echo " - all : builds all"
 	@echo " - ecgen : builds the main binary"
+	@echo " - econvert : build the format conversion binary"
 	@echo " - docs : generate doxygen docs"
+	@echo " - test : test the main binary"
 	@echo " - clean : cleans up after a build"
 	@echo " - clean-all : cleans all"
 	@echo " - format : run clang-format on source files"
 	@echo " - help : print this help"
 
-.PHONY: all docs help
+.PHONY: all clean clean-all docs test help
 
-ifeq (, $(filter all clean clean-all docs help, $(MAKECMDGOALS)))
+ifeq (, $(filter all clean clean-all docs test help, $(MAKECMDGOALS)))
 # Just pass all targets to a Makefile in src
 $(MAKECMDGOALS):
 	+$(MAKE) -C src $@
diff --git a/src/Makefile b/src/Makefile
index 4acb340..f57a828 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@
 CC ?= gcc
 
 CFLAGS = -Wall
-DEBUG ?= 1
+DEBUG ?= 0
 ifeq ($(DEBUG), 1)
     CFLAGS += -DDEBUG -g -Werror -pedantic
 else
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..3e92e99
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,9 @@
+
+
+test: ecgen econvert
+
+ecgen:
+	./ecgen.sh
+
+econvert:
+	./econvert.sh
\ No newline at end of file
diff --git a/test/ecgen.sh b/test/ecgen.sh
new file mode 100755
index 0000000..6a2d53e
--- /dev/null
+++ b/test/ecgen.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+ecgen="../ecgen"
+
+function runs() {
+	${ecgen} --help
+	${ecgen} --version
+}
+
+runs >/dev/null
\ No newline at end of file
diff --git a/test/econvert.sh b/test/econvert.sh
new file mode 100755
index 0000000..236543f
--- /dev/null
+++ b/test/econvert.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+econvert="../econvert"
+
+function runs() {
+	${econvert} --help
+	${econvert} --version
+}
+
+runs >/dev/null
\ No newline at end of file