mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-06 10:00:40 +02:00
WIP
This commit is contained in:
parent
5b5e0f109b
commit
eae1fb6609
@ -1,9 +1,8 @@
|
|||||||
target_sources(tests PRIVATE
|
target_sources(tests PRIVATE
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test-SharedMemory.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test-SharedMemory.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test-slsDetector.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test-slsDetector.cpp
|
||||||
# ${CMAKE_CURRENT_SOURCE_DIR}/test-multiSlsDetectorClient.cpp
|
|
||||||
# TODO! Migrate tests!
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-rx.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test-Result.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test-Result.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test-CmdLineParser.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/test-CmdLineParser.cpp
|
||||||
)
|
)
|
||||||
|
@ -6,11 +6,13 @@
|
|||||||
|
|
||||||
#include "tests/globals.h"
|
#include "tests/globals.h"
|
||||||
|
|
||||||
auto GET = slsDetectorDefs::GET_ACTION;
|
// auto GET = slsDetectorDefs::GET_ACTION;
|
||||||
auto PUT = slsDetectorDefs::PUT_ACTION;
|
// auto PUT = slsDetectorDefs::PUT_ACTION;
|
||||||
|
|
||||||
using sls::CmdProxy;
|
using sls::CmdProxy;
|
||||||
using sls::Detector;
|
using sls::Detector;
|
||||||
|
using test::GET;
|
||||||
|
using test::PUT;
|
||||||
|
|
||||||
// TEST_CASE("vchip", "[.cmd]") {
|
// TEST_CASE("vchip", "[.cmd]") {
|
||||||
// int prev_val = 0;
|
// int prev_val = 0;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,4 @@
|
|||||||
|
#pragma once
|
||||||
#include "sls_detector_defs.h"
|
#include "sls_detector_defs.h"
|
||||||
using dt = slsDetectorDefs::detectorType;
|
using dt = slsDetectorDefs::detectorType;
|
||||||
using di = slsDetectorDefs::dacIndex;
|
using di = slsDetectorDefs::dacIndex;
|
||||||
@ -8,4 +9,8 @@ extern std::string hostname;
|
|||||||
extern std::string detector_type;
|
extern std::string detector_type;
|
||||||
extern dt type;
|
extern dt type;
|
||||||
extern std::string my_ip;
|
extern std::string my_ip;
|
||||||
|
extern decltype(defs::GET_ACTION) GET;
|
||||||
|
extern decltype(defs::PUT_ACTION) PUT;
|
||||||
|
|
||||||
|
|
||||||
} // namespace test
|
} // namespace test
|
||||||
|
@ -18,6 +18,8 @@ std::string hostname;
|
|||||||
std::string detector_type;
|
std::string detector_type;
|
||||||
std::string my_ip;
|
std::string my_ip;
|
||||||
dt type;
|
dt type;
|
||||||
|
auto GET = slsDetectorDefs::GET_ACTION;
|
||||||
|
auto PUT = slsDetectorDefs::PUT_ACTION;
|
||||||
} // namespace test
|
} // namespace test
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user