From ba89fe72abedf372753fcd4dce7a9c9b63a1b648 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Fri, 24 Jan 2020 20:17:29 +0100
Subject: [PATCH] Improved some scripts

---
 CMakeLists.txt       | 43 +++++++++++++++++++++++++++----------------
 test/CommandTest.cpp | 24 +++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bba51ca..1d079d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,25 +201,36 @@ INSTALL (
 )
 
 set(TEST_LIBRARIES
-        sqlite3
-        ${LIBRARY_PATH_THREAD_POOL}    #Static
-        ${LIBRARY_PATH_TERMINAL}   #Static
-        ${LIBRARY_PATH_VARIBALES}
-        ${LIBRARY_PATH_YAML}
+        threadpool::static    #Static
+        TeaSpeak            #Static
+        CXXTerminal::static  #Static
+        ${StringVariable_LIBRARIES_STATIC}
+        ${YAML_CPP_LIBRARIES}
         pthread
         stdc++fs
-        ${TOM_LIBRARIES}
-        ${LIBEVENT_PATH}/libevent.a
-        ${LIBEVENT_PATH}/libevent_pthreads.a
+        libevent::core libevent::pthreads
+        opus::static
+        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
-
-        ${LIBRARY_PATH_DATA_PIPES}
-        ${LIBRARY_PATH_BORINGSSL_SSL}
-        ${LIBRARY_PATH_BORINGSSL_CRYPTO} #Crypto must be linked after
+        jsoncpp_lib
+        ${ed25519_LIBRARIES_STATIC}
+        ${DataPipes_LIBRARIES_SHARED}
+        openssl::ssl::shared
+        openssl::crypto::shared
         dl
         z
 )
@@ -230,7 +241,7 @@ if(BUILD_TESTS)
     target_link_libraries(RingTest ${TEST_LIBRARIES})
 
     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})
 
         add_executable(WebsocketTest ${SOURCE_FILES} ${HEADER_FILES} test/WSSTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h)
diff --git a/test/CommandTest.cpp b/test/CommandTest.cpp
index a1c7d44..fdd689f 100644
--- a/test/CommandTest.cpp
+++ b/test/CommandTest.cpp
@@ -21,6 +21,27 @@ using field = ts::descriptor::field<key_t, value_type_t>;
 template <class 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(
         ts::command& _cmd,
         const cconstants::return_code::optional& return_code,
@@ -56,7 +77,7 @@ command_result test3() {
 void eval_test(command_result x) {
     if(x.is_detailed()) {
         cout << "Detailed!" << endl;
-        delete x.release_details();
+        x.release_details();
     } else {
         auto a = x.permission_id();
         auto b = x.error_code();
@@ -65,6 +86,7 @@ void eval_test(command_result x) {
 }
 
 int main() {
+    test<"abs">();
     //for(const auto& error : avariableErrors)
     //    cout << error.name << " = " << hex << "0x" << error.errorId << "," << endl;