Merge remote-tracking branch 'origin/master' into 360-get-the-generic-queueing-into-master

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

mediachanger/acs/AcsTest.cpp

-/*
- * 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

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
 ################################################################################

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})