travis6 & test

TETYYS · Oct 24, 2015 · 5dbb775 · 5dbb775
1 parent 2da7ac6
commit 5dbb775
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,16 @@ compiler:
   - gcc
 
 script:
+  - cd libevent
+  - cmake .
+  - make
+  - make install
+  - cd ..
   - cmake .
   - make
 
 before_install:
+  - git clone https://github.com/libevent/libevent.git
   - sudo add-apt-repository -y ppa:maxmind/ppa
   - sudo apt-get -y update
-  - sudo apt-get install -y libevent-dev python2.7-dev libssl-dev libgeoip-dev libpcre3-dev libconfig-dev libmaxminddb0 libmaxminddb-dev mmdb-bin
+  - sudo apt-get install -y python2.7-dev libssl-dev libgeoip-dev libpcre3-dev libconfig-dev libmaxminddb0 libmaxminddb-dev mmdb-bin
diff --git a/Server.c b/Server.c
@@ -411,7 +411,7 @@ void ServerRead(struct bufferevent *BuffEvent, void *Ctx)
 	char *buff = malloc(len + 1);
 	evbuffer_copyout(evBuff, buff, len);
 
-#if defined DEBUG && defined __linux__
+#if defined DEBUG && defined HAVE_VALGRIND
 	VALGRIND_MAKE_MEM_DEFINED(buff, len + 1);
 #endif