Make vim and gdb support optional and use sstream

instead of fstream in test fixture.

Author: ObiWahn

.clang-format

@@ -0,0 +1 @@
+external_libs/ext-basics/.clang-format

CMakeLists.txt

@@ -11,6 +11,7 @@ option(EXTLOG_EXAMPLES "build examples" OFF)
 option(EXTLOG_WARNINGS "enable warnings" ON)
 option(EXTLOG_CHECKED "user assert" ON)
 option(EXTLOG_TESTS "build tests" OFF)
+option(EXTLOG_ENABLE_VIM_GDB "support vim / gdb" ON)
 
 ## general setup and includes
 set(CMAKE_CXX_STANDARD 17)
@@ -56,7 +57,7 @@ set(ext_common_compile_definitions
     $<IF:$<BOOL:${ext_is_big_endian}>,EXT_BIG_ENDIAN,EXT_LITTLE_ENDIAN>
     $<$<BOOL:${EXT_CXX_COMPILER_IS_GCC}>:EXT_GCC>
     $<$<BOOL:${EXT_CXX_COMPILER_IS_CLANG}>:EXT_CLANG>
-    $<$<BOOL:${ext_l1_cache_line_size}>:EXT_KNOWN_L1_CACHE_LINE_SIZE=${ext_l1_cache_line_size}>
+    $<$<BOOL:${EXTLOG_ENABLE_VIM_GDB}>:EXT_LOGGING_ENABLE_VIM_GDB>
 )
 
 
@@ -68,8 +69,8 @@ target_include_directories(ext-logging PUBLIC
 target_compile_features(ext-logging PUBLIC cxx_std_17)
 target_compile_options(ext-logging PRIVATE ${ext_stone-warnings})
 target_compile_definitions(ext-logging PUBLIC ${ext_common_compile_definitions})
-target_compile_definitions(ext-logging PUBLIC EXT_SHARED_LIB)
 target_compile_definitions(ext-logging PRIVATE EXT_IN_LIB=1)
+
 target_link_libraries(ext-logging PUBLIC
     ext::basics
     Threads::Threads

include/ext/logging/definitions.hpp

@@ -71,8 +71,10 @@ EXT_EXPORT_VC extern bool append_newline;
 EXT_EXPORT_VC extern bool threads;
 EXT_EXPORT_VC extern bool filename;
 EXT_EXPORT_VC extern bool function;
+#ifdef EXT_LOGGING_ENABLE_VIM_GDB
 EXT_EXPORT_VC extern bool vim;
 EXT_EXPORT_VC extern bool gdb;
+#endif
 EXT_EXPORT_VC extern std::ostream* stream;
 } // namespace configuration
 

src/logging.cpp

@@ -29,8 +29,10 @@ bool configuration::prefix_newline{false};
 bool configuration::append_newline{true};
 bool configuration::filename{true};
 bool configuration::function{true};
+#ifdef EXT_LOGGING_ENABLE_VIM_GDB
 bool configuration::vim{false};
 bool configuration::gdb{false};
+#endif
 std::ostream* configuration::stream = &std::cout;
 
 EXT_INIT_PRIORITY_VC_LOW
@@ -45,16 +47,19 @@ _detail::logger::logger(
     if (configuration::prefix_newline) {
         _ss << "\n";
     }
+
+#ifdef EXT_LOGGING_ENABLE_VIM_GDB
     // # vim <filename> +<lineno>
     if (configuration::vim) {
         _ss << "# vim " << file_name << " +" << line_no << "\n";
     }
 
     if (configuration::gdb) {
-#ifndef _WIN32
+    #ifndef _WIN32
         _ss << "# break " << ext::util::filename(file_name) << ":" << line_no << "\n";
-#endif
+    #endif
     }
+#endif
 
     if (true) {
         _ss << "[" << id << "] ";
@@ -69,15 +74,13 @@ _detail::logger::logger(
 
     // log filename
     if (configuration::filename) {
-        if (!configuration::gdb) {
             _ss << " "
 #ifndef _WIN32
                 << ext::util::filename(file_name)
 #else
                 << file_name
 #endif
                 << ":" << line_no;
-        }
     }
 
     // log function name
@@ -104,6 +107,7 @@ void _detail::logger::write() {
 _detail::logger::~logger() {
     try {
         write();
-    } catch (...) {}
+    } catch (...) {
+    }
 }
 }} // namespace ext::logging

tests/logging.cpp

@@ -1,8 +1,8 @@
 // Copyright - 2016-2020 - Jan Christoph Uhde <[email protected]>
 // Please see LICENSE.md for license or visit https://github.com/extcpp/basics
 #include <cstring>
-#include <fstream>
 #include <filesystem>
+#include <sstream>
 
 #include <gtest/gtest.h>
 
@@ -17,23 +17,20 @@
 using namespace std::literals;
 
 struct LoggingTest : public ::testing::Test {
-    LoggingTest() : _log{"test.log", std::ios::trunc} {
+    LoggingTest() : _log{} {
         using namespace ext::logging;
         configuration::stream = &_log;
+#ifdef EXT_LOGGING_ENABLE_VIM_GDB
         configuration::gdb = false;
         configuration::vim = false;
+#endif
         configuration::prefix_newline = false;
         configuration::append_newline = true;
         set_level_all(level::EXT_LOGGING_DEFAULT_LEVEL);
     };
 
-
     void compare(std::string const& expected = ""){
-        _log.close();
-        std::ifstream file{"test.log"};
-        std::istreambuf_iterator<char> eos;
-        std::string logged{std::istreambuf_iterator<char>(file), eos};
-        ASSERT_EQ(expected, logged);
+        ASSERT_EQ(expected, _log.str());
     }
 
     std::string path() {
@@ -48,24 +45,28 @@ struct LoggingTest : public ::testing::Test {
         return std::to_string(_line);
     }
 
-    std::ofstream _log;
+    std::stringstream _log;
     std::size_t _line;
 
 };
 using LoggingDeathTest = LoggingTest;
 
 TEST_F(LoggingTest, logging_no_crash_gdb_vim) {
     using namespace ext::logging;
+#ifdef EXT_LOGGING_ENABLE_VIM_GDB
     configuration::gdb = true;
     configuration::vim = true;
+#endif
 
     _line = __LINE__ + 1;
     ASSERT_NO_THROW(EXT_LOG("babe") << "cafe?");
 
     compare(
+#ifdef EXT_LOGGING_ENABLE_VIM_GDB
         "# vim "s + path() + " +" + line() +"\n"
         "# break logging.cpp:" + line() + "\n"
-        "[babe] warning in TestBody(): 'cafe?'\n"
+#endif
+        "[babe] warning logging.cpp:"s + line() + " in TestBody(): 'cafe?'\n"
     );
 }