From 85e9e36e78b4b1d126724ccb42ace214654ff5c4 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 27 Aug 2014 18:17:08 +0200
Subject: [PATCH] full-test: do not require --without-protobuf

---
 tests/docker-ocserv/Dockerfile | 9 +++++----
 tests/full-test                | 8 --------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/docker-ocserv/Dockerfile b/tests/docker-ocserv/Dockerfile
index 542c30dc..8c0d52dc 100644
--- a/tests/docker-ocserv/Dockerfile
+++ b/tests/docker-ocserv/Dockerfile
@@ -1,9 +1,10 @@
 FROM tianon/debian:jessie
 
-RUN apt-get update
-RUN apt-get install -y libgnutls28
+RUN apt-get update;sleep 1
+RUN apt-get install -y libgnutls-deb0-28
+RUN apt-get install -y libprotobuf-c1
 RUN apt-get install -y libwrap0 libpam0g libseccomp2 libdbus-1-3 libreadline5 libnl-route-3-200
-RUN apt-get install -y libprotobuf-c0 libhttp-parser2.1 libpcl1 libopts25 autogen
+RUN apt-get install -y libhttp-parser2.1 libpcl1 libopts25 autogen
 RUN apt-get install -y libsystemd-daemon0 valgrind nuttcp openssh-server bash
 #RUN apt-get install -y inotify-tools
 RUN apt-get update
@@ -35,4 +36,4 @@ ADD myscript /usr/bin/
 # template, so we untar it from this archive.
 ADD dev-tun.tgz /dev/
 
-CMD nuttcp -S;/etc/init.d/ssh restart;mkdir -p /tmp/disconnect/;usr/sbin/ocserv -d 1 -f 
+CMD nuttcp -S;/etc/init.d/ssh restart;mkdir -p /tmp/disconnect/;usr/sbin/ocserv -d 1 -f;sleep 3600
diff --git a/tests/full-test b/tests/full-test
index 173163e5..ce1d5bef 100755
--- a/tests/full-test
+++ b/tests/full-test
@@ -53,14 +53,6 @@ if test $? != 0;then
 	exit 77
 fi
 
-grep without-protobuf $srcdir/../config.log >/dev/null 2>&1
-if test $? != 0;then
-	echo "****************************************************************"
-	echo "This test requires compiling ocserv using --without-protobuf"
-	echo "****************************************************************"
-	exit 77
-fi
-
 stop() {
 	$DOCKER stop test_ocserv
 	$DOCKER rm test_ocserv