From 6feaa29c621ce6c8da8860e18df5b0c905940eb9 Mon Sep 17 00:00:00 2001 From: gabime Date: Sun, 13 Dec 2015 14:36:32 +0200 Subject: [PATCH] tests: added utils.cpp to avoid gcc warnings --- bench/Makefile | 2 +- tests/includes.h | 12 ++---------- tests/utils.cpp | 11 +++++++++++ tests/utils.h | 4 ++++ 4 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 tests/utils.cpp create mode 100644 tests/utils.h diff --git a/bench/Makefile b/bench/Makefile index c0edbd6c..0397cfdf 100644 --- a/bench/Makefile +++ b/bench/Makefile @@ -17,7 +17,7 @@ spdlog-async: spdlog-async.cpp $(CXX) spdlog-async.cpp -o spdlog-async $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -BOOST_FLAGS = -DBOOST_LOG_DYN_LINK -I/home/gabi/devel/boost_1_56_0/ -L/home/gabi/devel/boost_1_56_0/stage/lib -lboost_log -lboost_log_setup -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_date_time -lboost_chrono +BOOST_FLAGS = -DBOOST_LOG_DYN_LINK -I/usr/include -lboost_log -lboost_log_setup -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_date_time -lboost_chrono boost-bench: boost-bench.cpp $(CXX) boost-bench.cpp -o boost-bench $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS) diff --git a/tests/includes.h b/tests/includes.h index d19e2100..9cdee274 100644 --- a/tests/includes.h +++ b/tests/includes.h @@ -8,16 +8,8 @@ #include #include "catch.hpp" +#include "utils.h" + #include "../include/spdlog/spdlog.h" #include "../include/spdlog/sinks/null_sink.h" - -static void prepare_logdir() -{ - spdlog::drop_all(); -#ifdef _WIN32 - auto rv = system("del /F /Q logs\\*"); -#else - auto rv = system("rm -f logs/*"); -#endif -} \ No newline at end of file diff --git a/tests/utils.cpp b/tests/utils.cpp new file mode 100644 index 00000000..5ae8ea8f --- /dev/null +++ b/tests/utils.cpp @@ -0,0 +1,11 @@ +#include "includes.h" + +void prepare_logdir() +{ + spdlog::drop_all(); +#ifdef _WIN32 + auto rv = system("del /F /Q logs\\*"); +#else + auto rv = system("rm -f logs/*"); +#endif +} diff --git a/tests/utils.h b/tests/utils.h new file mode 100644 index 00000000..6701d6e7 --- /dev/null +++ b/tests/utils.h @@ -0,0 +1,4 @@ +#pragma once + +void prepare_logdir(); +