HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1203:5bd91523463d

tools/Jobs.pm ~~tests/scripts/Jobs.pm~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/Jobs.pm to tools/Jobs.pm

tools/Tiny.pm ~~tests/scripts/Tiny.pm~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/Tiny.pm to tools/Tiny.pm

tools/build.pl ~~tests/scripts/build.pl~~ renamed +1 -1

             use File::Basename;
             use feature "switch";
-            use lib 'test/scripts';
+            use lib 'tools';
             use Jobs;
             # read command line params
             my $jobname = shift;
             # get script directory
             my $scriptdir = File::Basename::dirname($0);
             # read ini file
             my $inifile = $scriptdir . "/jobs.ini";
             my %job = Jobs::get($inifile, $jobname);
             # examine the platform
             given ($job{'Platform'}) {
             	when ("Win7") {
             		$scriptdir =~ s/\//\\/g; # replace / -> \
             		# construct a build command
             		if ($job{'ToolChain'} eq "mingw") {
             			run($scriptdir . "\\build_win_mingw.bat", $job{'QtDir'}, $job{'Config'}, $job{'MinGWDir'});
             		}
             		elsif ($job{'ToolChain'} eq "vs2005") {
             			run($scriptdir . "\\build_win_vs2005.bat", $job{'QtDir'}, $job{'Config'});
             		}
             		elsif ($job{'ToolChain'} eq "vs2008") {
             			run($scriptdir . "\\build_win_vs2008.bat", $job{'QtDir'}, $job{'Config'});
             		}
             		elsif ($job{'ToolChain'} eq "vs2010") {
             			run($scriptdir . "\\build_win_vs2010.bat", $job{'QtDir'}, $job{'Config'});
             		}
             		elsif ($job{'ToolChain'} eq "vs2010-64bit") {
             			run($scriptdir . "\\build_win_vs2010_64bit.bat", $job{'QtDir'}, $job{'Config'});
             		}
             		else {
             			die "Unknown toolchain!";
             		}
             	}
             	when ("Mac") {
             		# setup build environment
             		$ENV{'QTDIR'} = $job{'QtDir'};
             		$ENV{'PATH'} = $job{'QtDir'} . "/bin:" . $ENV{'PATH'};
             		# run qmake
             		my $cmd;
             		if ($job{'ToolChain'} eq "clang") {
             			run("qmake -r -spec unsupported/macx-clang CONFIG+=" . $job{'Config'});
             		}
             		elsif ($job{'ToolChain'} eq "gcc") {
             			run("qmake -r CONFIG+=" . $job{'Config'});
             		}
             		else {
             			die "Unknown toolchain!";
             		}
             		# run make
             		run("make");
             	}
             	when ("Linux") {
             		# setup build environment
             		$ENV{'QTDIR'} = $job{'QtDir'};
             		$ENV{'PATH'} = $job{'QtDir'} . "/bin:" . $ENV{'PATH'};
             		# run qmake
             		my $cmd;
             		if ($job{'ToolChain'} eq "gcc") {
             			run("qmake -r CONFIG+=" . $job{'Config'});
             		}
             		else {
             			die "Unknown toolchain!";
             		}
             		# run make
             		run("make -j 4");
             	}
             	default {
             		die "Unknown platform " . $job{'Platform'};
             	}
             }
             sub run {
             	my $cmd;
             	foreach (@_) {
             		$cmd .= "$_ ";
             	}
             	print "running : $cmd\n";
             	system(@_) == 0 or die "system \"$cmd\" failed: $?";
             }

tools/build_win_mingw.bat ~~tests/scripts/build_win_mingw.bat~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/build_win_mingw.bat to tools/build_win_mingw.bat

tools/build_win_vs2005.bat ~~tests/scripts/build_win_vs2005.bat~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/build_win_vs2005.bat to tools/build_win_vs2005.bat

tools/build_win_vs2008.bat ~~tests/scripts/build_win_vs2008.bat~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/build_win_vs2008.bat to tools/build_win_vs2008.bat

tools/build_win_vs2010.bat ~~tests/scripts/build_win_vs2010.bat~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/build_win_vs2010.bat to tools/build_win_vs2010.bat

tools/build_win_vs2010_64bit.bat ~~tests/scripts/build_win_vs2010_64bit.bat~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/build_win_vs2010_64bit.bat to tools/build_win_vs2010_64bit.bat

tools/jobs.ini ~~tests/scripts/jobs.ini~~ renamed 0 0

NO CONTENT: file renamed from tests/scripts/jobs.ini to tools/jobs.ini

tools/run_tests.pl ~~tests/scripts/run_tests.pl~~ renamed +1 -1

             use Cwd;
             use Cwd 'abs_path';
             use File::Basename;
             use File::Copy;
             use feature "switch";
-            use lib 'test/scripts';
+            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 $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;
             }

tests/scripts/execute_tst.perl removed 0 -42

NO CONTENT: file was removed

	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