External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ebdca940b4 into 7f91301946

Browse Source
This commit is contained in:
Stephan Beyer 2016-01-24 14:18:24 +00:00
commit 15c9bbc3e1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -4,9 +4,9 @@ os:
- linux - linux
- osx - osx
env: env:
- DEFINES=standard - DEFINES=PUGIXML_NO_CXX11
- DEFINES=PUGIXML_WCHAR_MODE - DEFINES=PUGIXML_NO_CXX11,PUGIXML_WCHAR_MODE
- DEFINES=PUGIXML_COMPACT - DEFINES=PUGIXML_NO_CXX11,PUGIXML_COMPACT
script: script:
- make test config=coverage defines=$DEFINES -j2 - make test config=coverage defines=$DEFINES -j2
- make test config=release defines=$DEFINES -j2 - make test config=release defines=$DEFINES -j2

7
Makefile
View File

@ -47,9 +47,10 @@ ifneq ($(findstring PUGIXML_NO_EXCEPTIONS,$(defines)),)
CXXFLAGS+=-fno-exceptions CXXFLAGS+=-fno-exceptions
endif endif
ifeq ($(findstring PUGIXML_NO_CXX11,$(defines)),) ifneq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
# Can't use std=c++11 since Travis-CI has gcc 4.6.3 CXXFLAGS+=-std=c++03
CXXFLAGS+=-std=c++0x else
CXXFLAGS+=-std=c++11
endif endif
OBJECTS=$(SOURCES:%=$(BUILD)/%.o) OBJECTS=$(SOURCES:%=$(BUILD)/%.o)

2
tests/test_parse.cpp
View File

@ -1181,4 +1181,4 @@ TEST(parse_embed_pcdata)
CHECK_NODE_EX(doc, STR("<node>\n<key>value</key>\n<child>\n<inner1>value1</inner1>\n<inner2>value2</inner2>outer</child>\n<two>text<data />\n</two>\n</node>\n"), STR("\t"), 0); CHECK_NODE_EX(doc, STR("<node>\n<key>value</key>\n<child>\n<inner1>value1</inner1>\n<inner2>value2</inner2>outer</child>\n<two>text<data />\n</two>\n</node>\n"), STR("\t"), 0);
CHECK_NODE_EX(doc, STR("<node>\n\t<key>value</key>\n\t<child>\n\t\t<inner1>value1</inner1>\n\t\t<inner2>value2</inner2>outer</child>\n\t<two>text<data />\n\t</two>\n</node>\n"), STR("\t"), format_indent); CHECK_NODE_EX(doc, STR("<node>\n\t<key>value</key>\n\t<child>\n\t\t<inner1>value1</inner1>\n\t\t<inner2>value2</inner2>outer</child>\n\t<two>text<data />\n\t</two>\n</node>\n"), STR("\t"), format_indent);
} }
} }