diff options
author | watercal <brofield@users.noreply.github.com> | 2020-06-16 17:57:49 +0300 |
---|---|---|
committer | watercal <brofield@users.noreply.github.com> | 2020-06-16 17:57:49 +0300 |
commit | ff3ba14154eedec7f3f1b29a403cc072ca6846c2 (patch) | |
tree | 922ee506e3f4fee7af59f42a02534273dedecd3c /tests | |
parent | 3fea945de7264e7a6ae058211203a7f2b1a42b9d (diff) |
Fixing build on linux
Diffstat (limited to 'tests')
-rw-r--r-- | tests/.gitignore | 4 | ||||
-rw-r--r-- | tests/Makefile | 20 | ||||
-rw-r--r-- | tests/ts-roundtrip.cpp | 2 | ||||
-rw-r--r-- | tests/ts-snippets.cpp | 2 | ||||
-rw-r--r-- | tests/ts-utf8.cpp | 2 |
5 files changed, 27 insertions, 3 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index 51ade18..7bc89f0 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,5 @@ example2.ini + +tests +*.o + diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..ae3082e --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,20 @@ +CC=g++ +CFLAGS=-Wall -std=c++11 +CPPFLAGS=-Wall -std=c++11 +LDFLAGS=-lpthread -lgtest -lgtest_main -lpthread -L/usr/lib + +OBJS=ts-roundtrip.o ts-snippets.o ts-utf8.o + +BIN=./tests + +all: $(OBJS) + $(CC) -o $(BIN) $(OBJS) $(LDFLAGS) + +clean: + rm -f core $(OBJS) $(BIN) + +test: $(BIN) + $(BIN) + +$(OBJS): ../SimpleIni.h + diff --git a/tests/ts-roundtrip.cpp b/tests/ts-roundtrip.cpp index 3808a08..d4e663a 100644 --- a/tests/ts-roundtrip.cpp +++ b/tests/ts-roundtrip.cpp @@ -4,7 +4,7 @@ class TestRoundTrip : public ::testing::Test { protected: - void TestRoundTrip::SetUp() override; + void SetUp() override; void TestMulti(); void TestBOM(bool useBOM); diff --git a/tests/ts-snippets.cpp b/tests/ts-snippets.cpp index d18150e..8814e0b 100644 --- a/tests/ts-snippets.cpp +++ b/tests/ts-snippets.cpp @@ -143,7 +143,7 @@ TEST(TestSnippets, TestGettingValues) { // output all of the items CSimpleIniA::TNamesDepend::const_iterator it; for (it = values.begin(); it != values.end(); ++it) { - printf("value = '%s'\n", it->pItem); + //printf("value = '%s'\n", it->pItem); } diff --git a/tests/ts-utf8.cpp b/tests/ts-utf8.cpp index 9208648..a463dc3 100644 --- a/tests/ts-utf8.cpp +++ b/tests/ts-utf8.cpp @@ -3,7 +3,7 @@ class TestUTF8 : public ::testing::Test { protected: - void TestUTF8::SetUp() override; + void SetUp() override; protected: CSimpleIniA ini; }; |