HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1979:1a95f90e0eef

Update babmoo tools

Jani Honkonen -

r1979:1a95f90e0eef

parent child

Context file:

r1979:1a95f90e0eef

Collapse all files

tools/jobs.ini +2 -2

             ; How to use
             ; ----------
             ; - Section name must match to "Job Name" in Bamboo.
             ;  * See ${bamboo.buildPlanName} in bamboo.
             ;  * Case sensitive.
             ; - The parameters given can be anything you need for that particular build.
             ;  * Implement your special parameter handling in the perl scripts.
             [Win7 MinGW debug QtC v4.8.0 (Jani's machine)]
             Platform=Win7
             QtDir=D:\Qt\4.8.0-MinGW-Commercial
             ToolChain=mingw
             Config=debug
             MinGWDir=D:\Qt\mingw
             [Win7 MinGW release QtC v4.8.0 (Jani's machine)]
             Platform=Win7
             QtDir=D:\Qt\4.8.0-MinGW-Commercial
             ToolChain=mingw
             Config=release
             MinGWDir=D:\Qt\mingw
             [Win7 vs2005 debug QtC v4.7.5 (Jani's machine)]
             Platform=Win7
             QtDir=D:\Qt\qt-win-commercial-4.7.5-vs2005
             ToolChain=vs2005
             Config=debug
             [Win7 vs2005 release QtC v4.7.5 (Jani's machine)]
             Platform=Win7
             QtDir=D:\Qt\qt-win-commercial-4.7.5-vs2005
             ToolChain=vs2005
             Config=release
             [Win7 vs2008 debug QtC v4.8.2 (Jani's machine)]
             Platform=Win7
-            QtDir=D:\Qt\qt-win-commercial-4.8.2-vs2008-15-Apr-2012
+            QtDir=D:\Qt\qt-win-commercial-4.8.2
             ToolChain=vs2008
             Config=debug
             [Win7 vs2008 release QtC v4.8.2 (Jani's machine)]
             Platform=Win7
-            QtDir=D:\Qt\qt-win-commercial-4.8.2-vs2008-15-Apr-2012
+            QtDir=D:\Qt\qt-win-commercial-4.8.2
             ToolChain=vs2008
             Config=release
             [Win7 vs2010 debug QtC v4.8.0 (Jani's machine)]
             Platform=Win7
             QtDir=D:\Qt\qt-win-commercial-4.8.0-vs2010
             ToolChain=vs2010
             Config=debug
             [Win7 vs2010 release QtC v4.8.0 (Jani's machine)]
             Platform=Win7
             QtDir=D:\Qt\qt-win-commercial-4.8.0-vs2010
             ToolChain=vs2010
             Config=release
             [Win7 vs2010-64bit debug QtC v4.8.1]
             Platform=Win7
             QtDir=C:\Qt\4.8.1
             ToolChain=vs2010-64bit
             Config=debug
             [Win7 vs2010-64bit release QtC v4.8.1]
             Platform=Win7
             QtDir=C:\Qt\4.8.1
             ToolChain=vs2010-64bit
             Config=release
             [Mac 10.7 Cocoa clang debug QtC v4.8.0 (Tero's iMac)]
             Platform=Mac
             QtDir=/Users/teahola/QtCommercialSdk/Desktop/480/cocoa_gcc
             ToolChain=clang
             Config=debug
             [Mac 10.7 Cocoa clang release QtC v4.8.0 (Tero's iMac)]
             Platform=Mac
             QtDir=/Users/teahola/QtCommercialSdk/Desktop/480/cocoa_gcc
             ToolChain=clang
             Config=release
             [Mac 10.7 Cocoa gcc debug QtC v4.8.0 (Tero's iMac)]
             Platform=Mac
             QtDir=/Users/teahola/QtCommercialSdk/Desktop/480/cocoa_gcc
             ToolChain=gcc
             Config=debug
             [Mac 10.7 Cocoa gcc release QtC v4.8.0 (Tero's iMac)]
             Platform=Mac
             QtDir=/Users/teahola/QtCommercialSdk/Desktop/480/cocoa_gcc
             ToolChain=gcc
             Config=release
             [Ubuntu 10.10 x86 debug QtC v4.8.1]
             Platform=Linux
             QtDir=/usr/local/Trolltech/Qt-4.8.1
             ToolChain=gcc
             Config=debug
             [Ubuntu 10.10 x86 release QtC v4.8.1]
             Platform=Linux
             QtDir=/usr/local/Trolltech/Qt-4.8.1
             ToolChain=gcc
             Config=release
             [Ubuntu 10.10 x86_64 debug QtC v4.8.1]
             Platform=Linux
             QtDir=/usr/local/Trolltech/Qt-4.8.1
             ToolChain=gcc
             Config=debug
             [Ubuntu 10.10 x86_64 release QtC v4.8.1]
             Platform=Linux
             QtDir=/usr/local/Trolltech/Qt-4.8.1
             ToolChain=gcc
             Config=release

tools/run_tests.pl +1 -1

             use Cwd;
             use Cwd 'abs_path';
             use File::Basename;
             use File::Copy;
             use feature "switch";
             use lib 'tools';
             use Jobs;
             # read command line params
             my $jobname = shift;
             # read ini file
             my $inifile = File::Basename::dirname($0) . "/jobs.ini";
             my %job = Jobs::get($inifile, $jobname);
             # set/get paths
             my $root_path = abs_path();
-            my $bin_path = "$root_path/bin/";
+            my $bin_path = "$root_path/bin/" . $job{'Config'} . "/";
             my $reports_path = "test-reports";
             # create reports path
             mkdir $reports_path;
             # setup environment for running tests
             given ($job{'Platform'}) {
             	when ("Win7") {
             		# Add qtdir to path
             		$ENV{'PATH'} .= ";" . $job{'QtDir'} . "\\bin";
             		# replace / -> \
             		$ENV{'PATH'} =~ s/\//\\/g;
             	}
             	when ("Linux") {
             		# Add qtdir to path
             		$ENV{'PATH'} = $job{'QtDir'} . "/bin:" . $ENV{'PATH'};
             		# If this is not set we get "cannot connect to X server" errors
             		$ENV{'DISPLAY'} = ":0.0";
             	}
             }
             # Go through all the files in the test folder
             # autotest is an executable beginning with "tst_"
             my $script_exit_status = 0;
             opendir (TESTAPPDIR, "$bin_path") or die "Couldn't open test app dir";
             @files = <TESTAPPDIR>;
             while ($testapp = readdir TESTAPPDIR) {
                 if (index($testapp, "tst_") == 0) {
                     if (-x "$bin_path$testapp") {
                         my $status = executeTestApp($testapp);
             			if ($status != 0) {
             				$script_exit_status = $status;
             			}
                     } else {
                         #print "file $testapp not executable\n";
                     }
                 }
             }
             closedir TESTAPPDIR;
             print "\n*** script exit status : $script_exit_status ***\n\n";
             exit($script_exit_status);
             sub executeTestApp($) {
                 my $testapp = $_[0];
             	# On OSX the actual test binary is in a sub folder
             	my $cmd_postfix = "";
             	if ($^O eq "darwin") {
             		$cmd_postfix = "/Contents/MacOS/$testapp";
             		$cmd_postfix = substr($cmd_postfix, 0, rindex($cmd_postfix, ".app"));
             	}
                 my $cmd = "$bin_path$testapp$cmd_postfix -xunitxml -o $reports_path/$testapp.xml";
                 print "executing: $cmd\n";
                 system($cmd);
             	# From http://perldoc.perl.org/perlvar.html about $?:
             	# The upper eight bits reflect specific error conditions encountered by the
                 # program (the program's exit() value). The lower eight bits reflect
                 # mode of failure, like signal death and core dump information.
                 # See wait(2) for details.
                 my $exit_status = $? >> 8;
                 print "\texit status: $exit_status\n";
             	return $exit_status;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages