Fix ci after last plugin and server changes.s20170424

2 files changed, 13 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba0e4fb7..89795b55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ image: debian:stable
 
 variables:
   MYSQL_ROOT_PASSWORD: root
-  CPPFLAGS: "--enable-packetver=20150513"
+  packetver: "20150513"
 
 build_test:
   stage: build
@@ -22,7 +22,7 @@ build_test:
     make autoconf automake autopoint
     libtool libmysqlclient-dev libz-dev libpcre3-dev"
   - ./.tools/jobs/cloneall.sh
-  - ./.tools/jobs/build.sh "--enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
   image: debian:unstable
   services:
   - mysql:latest
@@ -97,7 +97,7 @@ mysql_run_latest:
     libtool libmysqlclient-dev libz-dev libpcre3-dev"
   - ./.tools/jobs/cloneall.sh
   - ./.tools/jobs/initdb.sh mysql
-  - ./.tools/jobs/build.sh "--enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
   - ./.tools/jobs/runserver.sh mysql
   image: debian:unstable
   services:
@@ -113,7 +113,7 @@ mariadb_run_latest:
     libtool libmysqlclient-dev libz-dev libpcre3-dev"
   - ./.tools/jobs/cloneall.sh
   - ./.tools/jobs/initdb.sh mariadb
-  - ./.tools/jobs/build.sh "--enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
   - ./.tools/jobs/runserver.sh mariadb
   image: debian:unstable
   services:
@@ -130,7 +130,7 @@ mysql_run_valgrind_latest:
     valgrind"
   - ./.tools/jobs/cloneall.sh
   - ./.tools/jobs/initdb.sh mysql
-  - ./.tools/jobs/build.sh "--enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror"
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror"
   - ./.tools/jobs/runservervalgrind.sh mysql
   image: debian:unstable
   services:
@@ -147,7 +147,7 @@ mariadb_run_valgrind_latest:
     valgrind"
   - ./.tools/jobs/cloneall.sh
   - ./.tools/jobs/initdb.sh mariadb
-  - ./.tools/jobs/build.sh "--enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror"
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror"
   - ./.tools/jobs/runservervalgrind.sh mariadb
   image: debian:unstable
   services:
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh
index 6ff3efdb..6effb177 100755
--- a/.tools/scripts/init.sh
+++ b/.tools/scripts/init.sh
@@ -110,12 +110,15 @@ function aptget_install {
 function make_server {
     ls -la ../server-data
     ls -la ../server-data/plugins
+    echo source src/evol/tools/vars.sh
+    source ./src/evol/tools/vars.sh
+    check_error $?
     export CPPFLAGS="$CPPFLAGS -DI_AM_AWARE_OF_THE_RISK_AND_STILL_WANT_TO_RUN_HERCULES_AS_ROOT"
     echo "autoreconf -i"
     autoreconf -i
     check_error $?
-    echo "./configure $*"
-    ./configure $1
+    echo ./configure $1 CPPFLAGS=\"${CPPFLAGS}\"
+    ./configure $1 CPPFLAGS="$CPPFLAGS"
     export err="$?"
     if [ "$err" != 0 ]; then
         echo "Error $err"
@@ -139,8 +142,8 @@ function make_server {
     check_error $?
     mkdir build
     cd build
-    echo "../configure $2"
-    ../configure $2
+    echo ../configure $2 CPPFLAGS=\"${VARS}\"
+    ../configure $2  CPPFLAGS="${VARS}"
     check_error $?
     echo "make -j2 V=0"
     make -j2 V=0