From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 5 Jan 2015 13:32:20 +0000 (-0500)
Subject: Build without libpcre for the optional library test in travis
X-Git-Tag: release_3_0_7~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be0fc14607d2c76be4c71bc672ed1edf4606cc9;p=thirdparty%2Ffreeradius-server.git

Build without libpcre for the optional library test in travis
---

diff --git a/.travis.yml b/.travis.yml
index c9941b3e954..b606b6e4f55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,6 @@ before_install:
       libyubikey-dev
   - sudo apt-get install -qq -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" libmysqlclient-dev
 before_script:
-  - CFLAGS="${BUILD_CFLAGS}" ./configure -C --enable-werror --prefix=$HOME/freeradius --with-shared-libs=$LIBS_SHARED --with-threads=$LIBS_OPTIONAL --with-udpfromto=$LIBS_OPTIONAL --with-openssl=$LIBS_OPTIONAL
+  - CFLAGS="${BUILD_CFLAGS}" ./configure -C --enable-werror --prefix=$HOME/freeradius --with-shared-libs=$LIBS_SHARED --with-threads=$LIBS_OPTIONAL --with-udpfromto=$LIBS_OPTIONAL --with-openssl=$LIBS_OPTIONAL --with-pcre=$LIBS_OPTIONAL
   - make
 script: if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then make travis-test; fi
diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named
index d5add8fbe75..5b633c809bb 100644
--- a/src/tests/keywords/if-regex-match-named
+++ b/src/tests/keywords/if-regex-match-named
@@ -1,5 +1,6 @@
 # PRE: if
 #
+if ('${feature.regex-pcre}' == 'yes') {
 update request {
 	Tmp-Integer-0 := '123456789'
 }
@@ -87,3 +88,4 @@ else {
 		Filter-Id += 'Fail 4.5'
 	}
 }
+}