aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rwxr-xr-xjenkins.sh9
-rwxr-xr-xpython/test_olm.sh2
-rw-r--r--src/libs.c (renamed from src/libs.cpp)4
4 files changed, 14 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4d265bf..774c923 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ JS_PRE := $(wildcard javascript/*pre.js)
JS_POST := $(wildcard javascript/*post.js)
CPPFLAGS += -Iinclude -Ilib
-CFLAGS += -Wall -Werror -std=c89 -fPIC
+# we rely on <stdint.h>, which was introduced in C99
+CFLAGS += -Wall -Werror -std=c99 -fPIC
CXXFLAGS += -Wall -Werror -std=c++11 -fPIC
LDFLAGS += -Wall -Werror
diff --git a/jenkins.sh b/jenkins.sh
new file mode 100755
index 0000000..c1efcb9
--- /dev/null
+++ b/jenkins.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+make clean
+make lib
+make test
+
+./python/test_olm.sh
diff --git a/python/test_olm.sh b/python/test_olm.sh
index b575cbf..9c72556 100755
--- a/python/test_olm.sh
+++ b/python/test_olm.sh
@@ -1,5 +1,7 @@
#! /bin/bash
+cd `dirname $0`
+
OLM="python -m olm"
ALICE_ACCOUNT=alice.account
diff --git a/src/libs.cpp b/src/libs.c
index 6757574..4304354 100644
--- a/src/libs.cpp
+++ b/src/libs.c
@@ -1,4 +1,4 @@
-/* Copyright 2015 OpenMarket Ltd
+/* Copyright 2015-6 OpenMarket Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-extern "C" {
#include "crypto-algorithms/sha256.c"
#include "crypto-algorithms/aes.c"
#include "curve25519-donna/curve25519-donna.c"
@@ -24,4 +23,3 @@ extern "C" {
#include "ed25519/src/verify.c"
#include "ed25519/src/sign.c"
#include "ed25519_additions.c"
-}