From dd9de685eb1af432a88af7840ca01f052ddb0c7e Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Mon, 17 May 2010 07:42:34 +0000
Subject: tests: gcc version is now specified upon building

git-svn-id: http://pugixml.googlecode.com/svn/trunk@427 99668b35-9821-0410-8761-19e4c4f06640
---
 Jamfile.jam             | 2 +-
 Jamrules.jam            | 4 ++--
 tests/autotest-local.pl | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Jamfile.jam b/Jamfile.jam
index beba202..e3e5e9b 100644
--- a/Jamfile.jam
+++ b/Jamfile.jam
@@ -41,7 +41,7 @@ else
 	BUILD = build/$(toolset)/standard/$(configuration) ;
 }
 
-if ( $(toolset:I=^mingw) || $(toolset) = gcc )
+if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
 {
 	CCFLAGS = -fprofile-arcs -ftest-coverage ;
 	LDFLAGS = -fprofile-arcs ;
diff --git a/Jamrules.jam b/Jamrules.jam
index 8170f88..4907b7e 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -1,8 +1,8 @@
 # Rules for Jamfile.jam
 
-if ( $(toolset:I=^mingw) || $(toolset) = "gcc" )
+if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) )
 {
-	if ( $(toolset) = "gcc" )
+	if ( $(toolset:I^=gcc) )
 	{
 		GCCPATH = "" ;
 	}
diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl
index c655403..ebe785d 100644
--- a/tests/autotest-local.pl
+++ b/tests/autotest-local.pl
@@ -15,8 +15,13 @@ sub permute
 	@result;
 }
 
+sub gcctoolset
+{
+	return 'gcc' . `gcc -dumpversion`;
+}
+
 $fast = (shift eq 'fast');
-@toolsets = ($^O =~ /win/i) ? (bcc, cw, dmc, ic8, mingw34, mingw44, mingw45, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : (gcc);
+@toolsets = ($^O =~ /win/i) ? (bcc, cw, dmc, ic8, mingw34, mingw44, mingw45, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : (&gcctoolset());
 @configurations = (debug, release);
 @defines = (PUGIXML_NO_XPATH, PUGIXML_NO_EXCEPTIONS, PUGIXML_NO_STL, PUGIXML_WCHAR_MODE);
 
-- 
cgit v1.2.3