Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
cae21178
Commit
cae21178
authored
Jan 09, 2018
by
Anastasia Karachaliou
Browse files
transferring ConfigurationFileTest and SourcedParameterTest and file
from tapeserver/daemon to common directory
parent
9762cd3f
Changes
8
Hide whitespace changes
Inline
Side-by-side
common/CMakeLists.txt
View file @
cae21178
...
...
@@ -128,7 +128,8 @@ set (COMMON_LIB_SRC_FILES
utils/strerror_r_wrapper.cpp
CreationLog.cpp
Configuration.cpp
ConfigurationFile.cpp
ConfigurationFile.cpp
SourcedParameter.cpp
TapePool.cpp
Timer.cpp
UserIdentity.cpp
...
...
@@ -150,6 +151,8 @@ target_link_libraries (ctacommon
set
(
COMMON_UNIT_TESTS_LIB_SRC_FILES
checksum/ChecksumTest.cpp
ConfigurationFileTests.cpp
SourcedParameterTests.cpp
dataStructures/ArchiveFileTest.cpp
dataStructures/StorageClassTest.cpp
processCap/SmartCapTest.cpp
...
...
@@ -183,6 +186,6 @@ set_property(TARGET ctacommonunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property
(
TARGET ctacommonunittests PROPERTY VERSION
"
${
CTA_LIBVERSION
}
"
)
install
(
TARGETS ctacommonunittests DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
add_executable
(
mutexLtrace threading/MutexLtrace.cpp
)
target_link_libraries
(
mutexLtrace ctacommon
)
target_link_libraries
(
mutexLtrace ctacommon
)
tapeserver/dae
mon/ConfigurationFileTests.cpp
→
com
mon/ConfigurationFileTests.cpp
View file @
cae21178
File moved
tapeserver/dae
mon/SourcedParameter.cpp
→
com
mon/SourcedParameter.cpp
View file @
cae21178
...
...
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include
"
tapeserver/daemon/
SourcedParameter.hpp"
#include
"SourcedParameter.hpp"
#include
"tapeserver/daemon/FetchReportOrFlushLimits.hpp"
#include
"tapeserver/daemon/TpconfigLine.hpp"
#include
<algorithm>
...
...
@@ -123,4 +123,4 @@ void SourcedParameter<TpconfigLine>::addLogParamForValue(log::LogContext & lc) {
lc
.
pushOrReplace
({
"librarySlot"
,
m_value
.
rawLibrarySlot
});
}
}}}
// namespace cta::tape::daemon
\ No newline at end of file
}}}
// namespace cta::tape::daemon
tapeserver/dae
mon/SourcedParameter.hpp
→
com
mon/SourcedParameter.hpp
View file @
cae21178
File moved
tapeserver/dae
mon/SourcedParameterTests.cpp
→
com
mon/SourcedParameterTests.cpp
View file @
cae21178
...
...
@@ -18,8 +18,8 @@
#include
<gtest/gtest.h>
#include
"SourcedParameter.hpp"
#include
"FetchReportOrFlushLimits.hpp"
#include
"
common/
SourcedParameter.hpp"
#include
"
tapeserver/daemon/
FetchReportOrFlushLimits.hpp"
namespace
unitTests
{
...
...
tapeserver/daemon/CMakeLists.txt
View file @
cae21178
...
...
@@ -17,7 +17,6 @@ add_library(ctatapedaemon
DriveHandlerProxy.cpp
GarbageCollectorHandler.cpp
SignalHandler.cpp
SourcedParameter.cpp
SubprocessHandler.cpp
ProcessManager.cpp
TapedConfiguration.cpp
...
...
@@ -44,10 +43,8 @@ target_link_libraries(ctatapedaemon
File
)
add_library
(
ctadaemonunittests SHARED
ConfigurationFileTests.cpp
TapedConfigurationTests.cpp
TpconfigTests.cpp
SourcedParameterTests.cpp
)
TpconfigTests.cpp
)
set_property
(
TARGET ctadaemonunittests PROPERTY SOVERSION
"
${
CTA_SOVERSION
}
"
)
set_property
(
TARGET ctadaemonunittests PROPERTY VERSION
"
${
CTA_LIBVERSION
}
"
)
...
...
tapeserver/daemon/TapedConfiguration.hpp
View file @
cae21178
...
...
@@ -23,7 +23,7 @@
#include
<limits>
#include
"common/log/DummyLogger.hpp"
#include
"common/exception/Exception.hpp"
#include
"SourcedParameter.hpp"
#include
"
common/
SourcedParameter.hpp"
#include
"FetchReportOrFlushLimits.hpp"
#include
"Tpconfig.hpp"
...
...
tapeserver/daemon/Tpconfig.hpp
View file @
cae21178
...
...
@@ -19,7 +19,7 @@
#pragma once
#include
"tapeserver/daemon/TpconfigLine.hpp"
#include
"
tapeserver/dae
mon/SourcedParameter.hpp"
#include
"
com
mon/SourcedParameter.hpp"
#include
"common/exception/Exception.hpp"
#include
<map>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment