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

tests: Fixed deprecation warnings disabling for GCC 4.0, miscellaneous fixes for MacOS X

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@433 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-05-20 07:32:49 +00:00
parent 487a18107f
commit ca4866290b
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jamrules.jam
View File

@ -1,8 +1,8 @@
# Rules for Jamfile.jam # Rules for Jamfile.jam
if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) ) if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
{ {
if ( $(toolset:I^=gcc) ) if ( $(toolset:I=^gcc) )
{ {
GCCPATH = "" ; GCCPATH = "" ;
} }
@ -13,12 +13,6 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
CCFLAGS += -D$(defines) ; CCFLAGS += -D$(defines) ;
if ( $(toolset:I=^mingw3) )
{
# GCC3 does not have pragma diagnostic
CCFLAGS += -Wno-deprecated-declarations ;
}
if ( $(configuration) = "debug" ) if ( $(configuration) = "debug" )
{ {
CCFLAGS += -D_DEBUG ; CCFLAGS += -D_DEBUG ;
@ -33,6 +27,11 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
CCFLAGS += -fno-exceptions ; CCFLAGS += -fno-exceptions ;
} }
if ( $(toolset:I=^mingw) )
{
LDFLAGS += -static-libgcc -static ;
}
actions ObjectAction actions ObjectAction
{ {
"$(GCCPATH)gcc" -W -Wall -Wextra -Werror -pedantic -c $(>) -o $(<) $(CCFLAGS) "$(GCCPATH)gcc" -W -Wall -Wextra -Werror -pedantic -c $(>) -o $(<) $(CCFLAGS)
@ -40,12 +39,12 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
actions LibraryAction actions LibraryAction
{ {
"$(GCCPATH)ar" rc $(<) $(>) "$(GCCPATH)ar" rcs $(<) $(>)
} }
actions LinkAction actions LinkAction
{ {
"$(GCCPATH)g++" $(>) -o $(<) -static-libgcc -static $(LDFLAGS) "$(GCCPATH)g++" $(>) -o $(<) $(LDFLAGS)
} }
actions maxtargets 1 CoverageAction actions maxtargets 1 CoverageAction

2
tests/autotest-remote-server.pl
View File

@ -7,7 +7,7 @@ $vm = shift;
my $server = new IO::Socket::INET(LocalPort => 7183, Listen => 1); my $server = new IO::Socket::INET(LocalPort => 7183, Listen => 1);
die "Could not create socket: $!\n" unless $server; die "Could not create socket: $!\n" unless $server;
system("vboxmanage startvm $vm --type gui"); system("vboxmanage startvm $vm --type headless");
print "Listening for connection...\n"; print "Listening for connection...\n";

23
tests/test_deprecated.cpp
View File

@ -1,5 +1,18 @@
// This file includes all tests for deprecated functionality; this is going away in the next release! // This file includes all tests for deprecated functionality; this is going away in the next release!
#ifdef _MSC_VER
# pragma warning(disable: 4996)
#endif
#ifdef __GNUC__
# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# else
# define PUGIXML_DEPRECATED
# endif
#endif
#include <string.h> #include <string.h>
#include "common.hpp" #include "common.hpp"
@ -9,16 +22,6 @@
#include <vector> #include <vector>
#include <iterator> #include <iterator>
#ifdef _MSC_VER
# pragma warning(disable: 4996)
#endif
#ifdef __GNUC__
# if __GNUC__ >= 4
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# endif
#endif
// format_write_bom_utf8 - it's now format_write_bom! // format_write_bom_utf8 - it's now format_write_bom!
TEST_XML(document_save_bom_utf8, "<node/>") TEST_XML(document_save_bom_utf8, "<node/>")
{ {