Improved some scripts

This commit is contained in:
WolverinDEV 2020-01-24 20:17:29 +01:00
parent deeba1b73e
commit ba89fe72ab
2 changed files with 50 additions and 17 deletions

View File

@ -201,25 +201,36 @@ INSTALL (
) )
set(TEST_LIBRARIES set(TEST_LIBRARIES
sqlite3 threadpool::static #Static
${LIBRARY_PATH_THREAD_POOL} #Static TeaSpeak #Static
${LIBRARY_PATH_TERMINAL} #Static CXXTerminal::static #Static
${LIBRARY_PATH_VARIBALES} ${StringVariable_LIBRARIES_STATIC}
${LIBRARY_PATH_YAML} ${YAML_CPP_LIBRARIES}
pthread pthread
stdc++fs stdc++fs
${TOM_LIBRARIES} libevent::core libevent::pthreads
${LIBEVENT_PATH}/libevent.a opus::static
${LIBEVENT_PATH}/libevent_pthreads.a yaml-cpp
${LIBRARY_PATH_PROTOBUF}
#We're forsed to use boringssl caused by the fact that boringssl is already within webrtc!
#Require a so
sqlite3
breakpad::static
protobuf::libprotobuf
jemalloc::shared
tomcrypt::static
tommath::static
${LIBRARY_PATH_ED255}
${LIBRARY_PATH_JSON}
${LIBRARY_TOM_CRYPT}
mysqlclient.a mysqlclient.a
jsoncpp_lib
${LIBRARY_PATH_DATA_PIPES} ${ed25519_LIBRARIES_STATIC}
${LIBRARY_PATH_BORINGSSL_SSL} ${DataPipes_LIBRARIES_SHARED}
${LIBRARY_PATH_BORINGSSL_CRYPTO} #Crypto must be linked after openssl::ssl::shared
openssl::crypto::shared
dl dl
z z
) )
@ -230,7 +241,7 @@ if(BUILD_TESTS)
target_link_libraries(RingTest ${TEST_LIBRARIES}) target_link_libraries(RingTest ${TEST_LIBRARIES})
if(NOT WIN32) if(NOT WIN32)
add_executable(CommandTest ${SOURCE_FILES} ${HEADER_FILES} test/CommandTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) add_executable(CommandTest ${SOURCE_FILES} ${HEADER_FILES} test/CommandTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h ../server/MySQLLibSSLFix.c)
target_link_libraries(CommandTest ${TEST_LIBRARIES}) target_link_libraries(CommandTest ${TEST_LIBRARIES})
add_executable(WebsocketTest ${SOURCE_FILES} ${HEADER_FILES} test/WSSTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) add_executable(WebsocketTest ${SOURCE_FILES} ${HEADER_FILES} test/WSSTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h)

View File

@ -21,6 +21,27 @@ using field = ts::descriptor::field<key_t, value_type_t>;
template <class key_t> template <class key_t>
using trigger = ts::descriptor::trigger<key_t>; using trigger = ts::descriptor::trigger<key_t>;
template<unsigned N>
class FixedString {
public:
constexpr FixedString(char const* s) {
for (unsigned i = 0; i < N; ++i)
buf[i] = s[i];
}
constexpr operator const char*() const { return buf; }
[[nodiscard]] constexpr const char* c_str() const { return buf; }
private:
char buf[N + 1]{};
};
template<unsigned N> FixedString(char const (&)[N]) -> FixedString<N - 1>;
template<FixedString T>
void test() {
std::cout << "Parameter: " << T.c_str() << "\n";
}
void handleCommand( void handleCommand(
ts::command& _cmd, ts::command& _cmd,
const cconstants::return_code::optional& return_code, const cconstants::return_code::optional& return_code,
@ -56,7 +77,7 @@ command_result test3() {
void eval_test(command_result x) { void eval_test(command_result x) {
if(x.is_detailed()) { if(x.is_detailed()) {
cout << "Detailed!" << endl; cout << "Detailed!" << endl;
delete x.release_details(); x.release_details();
} else { } else {
auto a = x.permission_id(); auto a = x.permission_id();
auto b = x.error_code(); auto b = x.error_code();
@ -65,6 +86,7 @@ void eval_test(command_result x) {
} }
int main() { int main() {
test<"abs">();
//for(const auto& error : avariableErrors) //for(const auto& error : avariableErrors)
// cout << error.name << " = " << hex << "0x" << error.errorId << "," << endl; // cout << error.name << " = " << hex << "0x" << error.errorId << "," << endl;