You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/02/11 19:48:11 UTC
git commit: TS-2567: add --enable-test-tools build option
Updated Branches:
refs/heads/master 069c79ecf -> 60561d75e
TS-2567: add --enable-test-tools build option
We always build the test tools, but for QA automation, it is useful
to install them as well. Add a --enable-test-tools build option
that installs the jtest and http_load tools.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/60561d75
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/60561d75
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/60561d75
Branch: refs/heads/master
Commit: 60561d75e7740096b417639518293d38b5630462
Parents: 069c79e
Author: James Peach <jp...@apache.org>
Authored: Fri Feb 7 13:06:48 2014 -0800
Committer: James Peach <jp...@apache.org>
Committed: Tue Feb 11 10:47:09 2014 -0800
----------------------------------------------------------------------
CHANGES | 2 ++
ci/jenkins/jobs.yaml | 8 ++++----
configure.ac | 14 ++++++++++++++
tools/Makefile.am | 9 +++++++++
4 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60561d75/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8c0ceca..e0e5ee7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2567] Add --install-test-tools configure option.
+
*) [TS-1622] Add a new API, TSHttpTxnIsCacheable(), which allows a plugin
to determine whether a request (and/or response) would be cacheable.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60561d75/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index a76ebe2..e0c09be 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -48,7 +48,7 @@
- shell: |
cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
export DEB_BUILD_HARDENING
- "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+ "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --install-test-tools $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
make -j2 V=1
make check
make install
@@ -71,7 +71,7 @@
export CXX=clang++
export CXXFLAGS="-Qunused-arguments -std=c++11"
export WITH_LIBCPLUSPLUS=yes
- "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+ "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --install-test-tools $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
make -j2 V=1
make check
make install
@@ -92,7 +92,7 @@
( cd "${WORKSPACE}/src" && git clean -dfxq && autoreconf -fi )
- shell: |
cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
- "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins $ENABLE_DEBUG
+ "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --install-test-tools $ENABLE_DEBUG
gmake -j2 V=1
gmake check
gmake install
@@ -119,7 +119,7 @@
export CXXFLAGS=-m64
export CPPFLAGS=-I/opt/omni/include
export LDFLAGS="-L/opt/omni/lib/amd64 -R/opt/omni/lib/amd64"
- "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins --enable-example-plugins $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+ "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins --enable-example-plugins --install-test-tools $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
gmake -j2 V=1
gmake check
gmake install
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60561d75/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 44680c6..7be8bf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -475,6 +475,20 @@ AM_CONDITIONAL([BUILD_EXAMPLE_PLUGINS], [ test "x${enable_example_plugins}" = "x
#
+# Test tools. The test tools are always built, but not always installed. Installing
+# them is useful for QA, but not useful for most users, so we default this to disabled.
+#
+
+AC_MSG_CHECKING([whether to install testing tools])
+AC_ARG_ENABLE([test-tools],
+ [AS_HELP_STRING([--enable-test-tools],[install testing tools])],
+ [],
+ [enable_test_tools=no]
+)
+AC_MSG_RESULT([$enable_test_tools])
+AM_CONDITIONAL([BUILD_TEST_TOOLS], [ test "x${enable_test_tools}" = "xyes" ])
+
+#
# build c++ api
#
AC_MSG_CHECKING([whether to build c++ api])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60561d75/tools/Makefile.am
----------------------------------------------------------------------
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d18c0bf..c13b81f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,13 +23,22 @@ AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts
+if BUILD_TEST_TOOLS
+bin_PROGRAMS = jtest/jtest
+else
noinst_PROGRAMS = jtest/jtest
+endif
jtest_jtest_SOURCES = jtest/jtest.cc
jtest_jtest_LDADD = $(top_builddir)/lib/ts/libtsutil.la
if BUILD_HTTP_LOAD
+
+if BUILD_TEST_TOOLS
+bin_PROGRAMS += http_load/http_load
+else
noinst_PROGRAMS += http_load/http_load
+endif
http_load_http_load_LDADD = @OPENSSL_LIBS@
http_load_http_load_SOURCES = \