From ca4866290b2408c39575f4cea40f2bac16183631 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Thu, 20 May 2010 07:32:49 +0000
Subject: tests: Fixed deprecation warnings disabling for GCC 4.0,
 miscellaneous fixes for MacOS X

git-svn-id: http://pugixml.googlecode.com/svn/trunk@433 99668b35-9821-0410-8761-19e4c4f06640
---
 Jamrules.jam                    | 19 +++++++++----------
 tests/autotest-remote-server.pl |  2 +-
 tests/test_deprecated.cpp       | 23 +++++++++++++----------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Jamrules.jam b/Jamrules.jam
index 4907b7e..7cd9abc 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -1,8 +1,8 @@
 # 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 = "" ;
 	}
@@ -13,12 +13,6 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
 
 	CCFLAGS += -D$(defines) ;
 
-	if ( $(toolset:I=^mingw3) )
-	{
-		# GCC3 does not have pragma diagnostic
-		CCFLAGS += -Wno-deprecated-declarations ;
-	}
-
 	if ( $(configuration) = "debug" )
 	{
 		CCFLAGS += -D_DEBUG ;
@@ -33,6 +27,11 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
 		CCFLAGS += -fno-exceptions ;
 	}
 
+	if ( $(toolset:I=^mingw) )
+	{
+		LDFLAGS += -static-libgcc -static ;
+	}
+
 	actions ObjectAction
 	{
 		"$(GCCPATH)gcc" -W -Wall -Wextra -Werror -pedantic -c $(>) -o $(<) $(CCFLAGS)
@@ -40,12 +39,12 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
 	
 	actions LibraryAction
 	{
-		"$(GCCPATH)ar" rc $(<) $(>)
+		"$(GCCPATH)ar" rcs $(<) $(>)
 	}
 	
 	actions LinkAction
 	{
-		"$(GCCPATH)g++" $(>) -o $(<) -static-libgcc -static $(LDFLAGS) 
+		"$(GCCPATH)g++" $(>) -o $(<) $(LDFLAGS) 
 	}
 	
 	actions maxtargets 1 CoverageAction
diff --git a/tests/autotest-remote-server.pl b/tests/autotest-remote-server.pl
index 9b7e8c1..970476c 100644
--- a/tests/autotest-remote-server.pl
+++ b/tests/autotest-remote-server.pl
@@ -7,7 +7,7 @@ $vm = shift;
 my $server = new IO::Socket::INET(LocalPort => 7183, Listen => 1);
 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";
 
diff --git a/tests/test_deprecated.cpp b/tests/test_deprecated.cpp
index 4677fdf..4a9d3b4 100644
--- a/tests/test_deprecated.cpp
+++ b/tests/test_deprecated.cpp
@@ -1,24 +1,27 @@
 // This file includes all tests for deprecated functionality; this is going away in the next release!
 
-#include <string.h>
-
-#include "common.hpp"
-
-#include "writer_string.hpp"
-
-#include <vector>
-#include <iterator>
-
 #ifdef _MSC_VER
 #	pragma warning(disable: 4996)
 #endif
 
 #ifdef __GNUC__
-#	if __GNUC__ >= 4
+#	if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
 #		pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#	else
+#		define PUGIXML_DEPRECATED
 #	endif
 #endif
 
+
+#include <string.h>
+
+#include "common.hpp"
+
+#include "writer_string.hpp"
+
+#include <vector>
+#include <iterator>
+
 // format_write_bom_utf8 - it's now format_write_bom!
 TEST_XML(document_save_bom_utf8, "<node/>")
 {
-- 
cgit v1.2.3