This is an automated email from the ASF dual-hosted git repository. bcall pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push: new dd7870d Update s3auth test, removed cpp file and added the Catch main define in the unit test file dd7870d is described below commit dd7870d872e332775c777b1325b1a7894dbde805 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 --- 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" <commits@trafficserver.apache.org>'].