mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 16:35:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed tests under gcc

Browse Source
This commit is contained in:
gabime 2015-05-15 20:48:38 +03:00
parent 2f81e54568
commit b5eaef81d4
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/Makefile
View File

@ -1,10 +1,19 @@
CXX ?= g++ CXX ?= g++
CXXFLAGS = -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -Wl,--no-as-needed -I../include CXXFLAGS = -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -Wl,--no-as-needed -I../include
LDPFALGS = -pthread
CPP_FILES := $(wildcard *.cpp)
OBJ_FILES := $(addprefix ./,$(notdir $(CPP_FILES:.cpp=.o)))
tests: $(OBJ_FILES)
$(CXX) $(CXXFLAGS) $(LDPFALGS) -o $@ $^
%.o: %.cpp
g++ $(CXXFLAGS) -c -o $@ $<
all: %.cpp
$(CXX) $^ -o tests $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
clean: clean:
rm -f tests *.o logs/* rm -f tests *.o logs/*
rebuild: clean all rebuild: clean all

6
tests/file_log.cpp
View File

@ -4,7 +4,7 @@ static std::string file_contents(const std::string& filename)
{ {
std::ifstream ifs(filename); std::ifstream ifs(filename);
if (!ifs) if (!ifs)
throw std::exception("Failed open file "); throw std::runtime_error("Failed open file ");
return std::string((std::istreambuf_iterator<char>(ifs)), return std::string((std::istreambuf_iterator<char>(ifs)),
(std::istreambuf_iterator<char>())); (std::istreambuf_iterator<char>()));
@ -15,7 +15,7 @@ static std::size_t count_lines(const std::string& filename)
{ {
std::ifstream ifs(filename); std::ifstream ifs(filename);
if (!ifs) if (!ifs)
throw std::exception("Failed open file "); throw std::runtime_error("Failed open file ");
std::string line; std::string line;
size_t counter = 0; size_t counter = 0;
@ -28,7 +28,7 @@ std::ifstream::pos_type filesize(const std::string& filename)
{ {
std::ifstream ifs(filename, std::ifstream::ate | std::ifstream::binary); std::ifstream ifs(filename, std::ifstream::ate | std::ifstream::binary);
if (!ifs) if (!ifs)
throw std::exception("Failed open file "); throw std::runtime_error("Failed open file ");
return ifs.tellg(); return ifs.tellg();
} }