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 3a57712c56c25f35562f820dd0eed3da5cca4577
Author: Bryan Call <bc...@apache.org>
AuthorDate: Thu Jul 20 10:05:36 2017 +0200
Moved catch and got rid of centralizing unit tests
---
configure.ac | 1 -
tests/{unit_tests => }/catch.hpp | 0
tests/unit_tests/Makefile.am | 48 ----------------------------------------
tests/unit_tests/main.cpp | 20 -----------------
4 files changed, 69 deletions(-)
diff --git a/configure.ac b/configure.ac
index d2f7c15..06b04a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1979,7 +1979,6 @@ AC_CONFIG_FILES([
rc/trafficserver.conf
rc/trafficserver.service
rc/trafficserver.xml
- tests/unit_tests/Makefile
tools/Makefile
tools/trafficserver.pc
tools/tsxs
diff --git a/tests/unit_tests/catch.hpp b/tests/catch.hpp
similarity index 100%
rename from tests/unit_tests/catch.hpp
rename to tests/catch.hpp
diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am
deleted file mode 100644
index 89ae25c..0000000
--- a/tests/unit_tests/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# 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.
-
-AM_CPPFLAGS += \
- $(iocore_include_dirs) \
- -I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/api/include \
- @CURL_CFLAGS@ \
- @CURSES_CFLAGS@
-
-AM_LDFLAGS += \
- @OPENSSL_LDFLAGS@
-
-bin_PROGRAMS = unit_tests
-
-unit_tests_SOURCES = main.cpp
-
-unit_tests_LDADD = \
- $(top_builddir)/lib/records/librecords_p.a \
- $(top_builddir)/mgmt/libmgmt_p.la \
- $(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/proxy/shared/libUglyLogStubs.a \
- $(top_builddir)/mgmt/api/libtsmgmt.la \
- $(top_builddir)/lib/ts/libtsutil.la \
- @CURL_LIBS@ \
- @CURSES_LIBS@ \
- @LIBTCL@ @HWLOC_LIBS@
-
-
-include $(top_srcdir)/build/tidy.mk
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp
deleted file mode 100644
index 9898b98..0000000
--- a/tests/unit_tests/main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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"
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.
