From 5a1903a79d085dd6f1571f97de5f6c9103ccc4f4 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 24 Jan 2019 16:36:23 +0100
Subject: [PATCH] Revert "Added cta_mediachanger_acs_AcsTest unit-tests"
This reverts commit 5e55c15f5f87cf6764158515cf4b9bfb18468e4b.
Conflicts:
mediachanger/acs/AcsTest.cpp
mediachanger/acs/CMakeLists.txt
tests/CMakeLists.txt
---
cta.spec.in | 1 -
mediachanger/acs/AcsTest.cpp | 35 ---------------------------------
mediachanger/acs/CMakeLists.txt | 23 ----------------------
tests/CMakeLists.txt | 3 +--
4 files changed, 1 insertion(+), 61 deletions(-)
delete mode 100644 mediachanger/acs/AcsTest.cpp
diff --git a/cta.spec.in b/cta.spec.in
index 607f8a1796..25a8ab9ecd 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -286,7 +286,6 @@ Unit tests and system tests with virtual tape drives
%{_libdir}/libctadaemonunittests.so*
%{_libdir}/libctamediachangerunittests.so*
%{_libdir}/libctamediachangeracsdaemonunittests.so*
-%{_libdir}/libctamediachangeracsunittests.so*
%{_bindir}/cta-systemTests
%{_libdir}/libctadaemonunittests-multiprocess.so*
%attr(0644,root,root) %{_datadir}/%{name}-%{ctaVersion}/unittest/*.suppr
diff --git a/mediachanger/acs/AcsTest.cpp b/mediachanger/acs/AcsTest.cpp
deleted file mode 100644
index 262a031da8..0000000000
--- a/mediachanger/acs/AcsTest.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2015 CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mediachanger/acs/Acs.hpp"
-
-#include <gtest/gtest.h>
-
-namespace unitTests {
-
-class cta_mediachanger_acs_AcsTest: public ::testing::Test {
-protected:
-
- virtual void SetUp() {
- }
-
- virtual void TearDown() {
- }
-};
-
-} // namespace unitTests
diff --git a/mediachanger/acs/CMakeLists.txt b/mediachanger/acs/CMakeLists.txt
index 7f91026d4d..cd3b19b64e 100644
--- a/mediachanger/acs/CMakeLists.txt
+++ b/mediachanger/acs/CMakeLists.txt
@@ -43,29 +43,6 @@ set_target_properties (cta-acs PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX)
-################################################################################
-# Rules to build and install unit-tests
-################################################################################
-
-set(MEDIACHANGER_ACS_UNIT_TESTS_LIB_SRC_FILES
- AcsCmdLine.cpp
- AcsCmdLineTest.cpp
- AcsTest.cpp)
-
-add_library (ctamediachangeracsunittests SHARED
- ${MEDIACHANGER_ACS_UNIT_TESTS_LIB_SRC_FILES})
-set_property(TARGET ctamediachangeracsunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
-set_property(TARGET ctamediachangeracsunittests PROPERTY VERSION "${CTA_LIBVERSION}")
-
-target_link_libraries (ctamediachangeracsunittests
- cta-acs)
-
-set_target_properties (ctamediachangeracsunittests PROPERTIES
- COMPILE_FLAGS -I/usr/include/CDK
- COMPILE_DEFINITIONS LINUX)
-
-install(TARGETS ctamediachangeracsunittests DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
-
################################################################################
# Rules to build and install castor-tape-acs-dismount
################################################################################
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 10703a663c..bcf74c85da 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -45,8 +45,7 @@ target_link_libraries(cta-unitTests
if (NOT DEFINED NoACS)
target_link_libraries(cta-unitTests
- ctamediachangeracsdaemonunittests
- ctamediachangeracsunittests)
+ ctamediachangeracsdaemonunittests)
endif (NOT DEFINED NoACS)
set_property (TARGET cta-unitTests APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
--
GitLab