You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2017/10/08 20:21:14 UTC
[trafficserver] branch 7.1.x updated (7b278f3 -> 3393c47)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 7b278f3 Fix mem leak related to do_os_response() function
new 47ae544 Doc: Tweak makefiles to not build man pages for install if doc building is disabled.
new 3393c47 Update s3auth test, removed cpp file and added the Catch main define in the unit test file
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile.am | 2 ++
doc/Makefile.am | 2 ++
plugins/s3_auth/Makefile.inc | 9 ++++-----
plugins/s3_auth/unit-tests/main.cpp | 25 -------------------------
plugins/s3_auth/unit-tests/test_aws_auth_v4.cc | 1 +
5 files changed, 9 insertions(+), 30 deletions(-)
delete mode 100644 plugins/s3_auth/unit-tests/main.cpp
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 02/02: Update s3auth test,
removed cpp file and added the Catch main define in the unit test
file
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 3393c47bb0cb02d41b8ff1efeb6b271e3b2162c9
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Sep 27 20:18:22 2017 -0700
Update s3auth test, removed cpp file and added the Catch main define in the
unit test file
(cherry picked from commit dd7870d872e332775c777b1325b1a7894dbde805)
---
plugins/s3_auth/Makefile.inc | 9 ++++-----
plugins/s3_auth/unit-tests/main.cpp | 25 -------------------------
plugins/s3_auth/unit-tests/test_aws_auth_v4.cc | 1 +
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/plugins/s3_auth/Makefile.inc b/plugins/s3_auth/Makefile.inc
index 83af007..696aa5e 100644
--- a/plugins/s3_auth/Makefile.inc
+++ b/plugins/s3_auth/Makefile.inc
@@ -17,11 +17,10 @@
pkglib_LTLIBRARIES += s3_auth/s3_auth.la
s3_auth_s3_auth_la_SOURCES = s3_auth/s3_auth.cc s3_auth/aws_auth_v4.cc
-check_PROGRAMS += test_s3auth
+check_PROGRAMS += s3_auth/test_s3auth
-test_s3auth_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/tests/include -DAWS_AUTH_V4_UNIT_TEST
-test_s3auth_LDADD = $(OPENSSL_LIBS)
-test_s3auth_SOURCES = \
- s3_auth/unit-tests/main.cpp \
+s3_auth_test_s3auth_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/tests/include -DAWS_AUTH_V4_UNIT_TEST
+s3_auth_test_s3auth_LDADD = $(OPENSSL_LIBS)
+s3_auth_test_s3auth_SOURCES = \
s3_auth/unit-tests/test_aws_auth_v4.cc \
s3_auth/aws_auth_v4.cc
diff --git a/plugins/s3_auth/unit-tests/main.cpp b/plugins/s3_auth/unit-tests/main.cpp
deleted file mode 100644
index 6aed3a6..0000000
--- a/plugins/s3_auth/unit-tests/main.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file
-
- This file used for catch based tests. It is the main() stub.
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
diff --git a/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc b/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc
index f325179..a75b6bf 100644
--- a/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc
+++ b/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc
@@ -23,6 +23,7 @@
#include <string.h>
#include <openssl/hmac.h> /* EVP_MAX_MD_SIZE */
+#define CATCH_CONFIG_MAIN /* include main function */
#include <catch.hpp> /* catch unit-test framework */
#include "../aws_auth_v4.h" /* S3 auth v4 utility */
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 01/02: Doc: Tweak makefiles to not build man pages
for install if doc building is disabled.
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 47ae5441d860f35135e981aca4c9cfa1ce66261b
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Mon Oct 2 17:20:48 2017 -0500
Doc: Tweak makefiles to not build man pages for install if doc building is disabled.
(cherry picked from commit e971f7c587ae627605a510665100321fa0ac1892)
---
Makefile.am | 2 ++
doc/Makefile.am | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 0e8439d..6aa702a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,7 +96,9 @@ install-examples: examples
@cd example && $(MAKE) $(AM_MAKEFLAGS) install pkglibdir=$(pkglibexecdir)
install-data-hook:
+if BUILD_DOCS
@cd doc && $(MAKE) $(AM_MAKEFLAGS) install-man
+endif
rat:
java -jar $(top_srcdir)/ci/apache-rat-0.11-SNAPSHOT.jar -E $(top_srcdir)/ci/rat-regex.txt -d $(top_srcdir)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 557d8a4..d3c8e5a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,7 +28,9 @@ $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS): man
# Hook the 'all' target so that the man pages get generated in the "all" target, prior
# to "make install". If we leave it to "make install" time, then the man pages are likely
# to me generated as root.
+if BUILD_DOCS
all-am: $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+endif
endif
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.