Merge branch 'master' into return_for_test_failed

3 files changed, 7 insertions, 2 deletions

diff --git a/makefile b/makefile
index eebe3e9..c18cc85 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 CC=gcc
 CFLAGS=-Wall --std=c99 
-SRC=siphash.c halfsiphash.c test.c
+SRC=siphash.c halfsiphash.c test.c testmain.c
 BIN=test debug vectors
 
 ifneq ($(cROUNDS),)
diff --git a/test.c b/test.c
index 1f57594..64d2ec3 100644
--- a/test.c
+++ b/test.c
@@ -44,7 +44,7 @@ const char *labels[4] = {
 
 size_t lengths[4] = {8, 16, 4, 8};
 
-int main() {
+int siphash_test() {
     uint8_t in[64], out[16], k[16];
     int i;
     bool any_failed;
diff --git a/testmain.c b/testmain.c
new file mode 100644
index 0000000..bb9e024
--- /dev/null
+++ b/testmain.c
@@ -0,0 +1,5 @@
+int siphash_test();
+
+int main(void) {
+    return siphash_test();
+}