From 167eff56beb1429b6fbbdd7c9847020b683880a3 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Fri, 27 Sep 2013 10:59:11 -0400 Subject: [PATCH] Removed verbosity, extra db creation from travis build steps and fixed a db name --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ee727a8e..4807a350b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,14 +30,10 @@ before_script: - autoheader - automake --force-missing --add-missing - autoconf - - mysql -e 'create database zoneminder;' script: - - CXXFLAGS="$CXXFLAGS" ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=travis ZM_DB_PASS= + - CXXFLAGS="$CXXFLAGS" ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=travis ZM_DB_PASS='' - make - sudo make install - - grep -A2 'CREATE DATABASE' db/zm_create.sql - - mysql -u travis -e 'show databases;' - - sudo cat /usr/local/etc/zm.conf - mysql -u travis < db/zm_create.sql - - mysql -u travis zoneminder < db/test.monitor.sql + - mysql -u travis zm < db/test.monitor.sql - sudo zmpkg.pl start