HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1135:805cc58de1df

12

my $inifile = File::Basename::dirname($0) . "/jobs.ini";

12

my $inifile = File::Basename::dirname($0) . "/jobs.ini";

13

my %job = Jobs::get($inifile, $jobname);

13

my %job = Jobs::get($inifile, $jobname);

14

15

# get paths

16

my $root_path = abs_path();

17

my $test_path = "$root_path/bin/test/";

18

15

# Windows specific magic

19

# Windows specific magic

16

if ($job{'Platform'} eq "Win7") {

20

if ($job{'Platform'} eq "Win7") {

17

$ENV{'PATH'} .= ";" . $job{'QtDir'} . "\\bin"; # Add qtdir to path

21

$ENV{'PATH'} .= ";" . $job{'QtDir'} . "\\bin"; # Add qtdir to path

22

$ENV{'PATH'} .= ";" . $root_path . "\\bin"; # Add charts bin to path

23

$ENV{'PATH'} =~ s/\//\\/g; # replace / -> \

18

}

24

}

19

25

20

# Go through all the files in the test folder

26

# Go through all the files in the test folder

21

my $root_path = abs_path();

22

my $test_path = "$root_path/bin/test/";

23

opendir ~~(TESTAPPDIR, "~~$~~test_path") or die "Couldn~~'t ~~open~~ test ~~app~~ dir";

27

opendir (TESTAPPDIR, "$test_path") or die "Couldn't open test app dir";

24

@files = <TESTAPPDIR>;

28

@files = <TESTAPPDIR>;

25

while ($testapp = readdir TESTAPPDIR) {

29

while ($testapp = readdir TESTAPPDIR) {

48

my $test_app_path = $_[0];

52

my $test_app_path = $_[0];

49

my $parameters = $_[1];

53

my $parameters = $_[1];

50

54

51

print "~~executing~~: $~~cmd_prefix~~$test_app_path $parameters\n";

55

print "executing: $test_app_path $parameters\n";

52

my ~~$file_handle = system("~~$~~test_app_path~~ $parameters");

56

my $file_handle = system("$test_app_path $parameters");

53

57

54

my $exit_status = $? >> 8;

58

my $exit_status = $? >> 8;

55

# print "~~exit~~: $exit_status \n";

59

print "\texit status: $exit_status handle: $file_handle\n";

56

# print "handle: $file_handle\n";

57

}

60

}

	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

             my $inifile = File::Basename::dirname($0) . "/jobs.ini";
             my %job = Jobs::get($inifile, $jobname);
+            # get paths
+            my $root_path = abs_path();
+            my $test_path = "$root_path/bin/test/";
             # Windows specific magic
             if ($job{'Platform'} eq "Win7") {
             	$ENV{'PATH'} .= ";" . $job{'QtDir'} . "\\bin"; # Add qtdir to path
+            	$ENV{'PATH'} .= ";" . $root_path . "\\bin"; # Add charts bin to path
+            	$ENV{'PATH'} =~ s/\//\\/g; # replace / -> \
             }
             # Go through all the files in the test folder
-            my $root_path = abs_path();
-            my $test_path = "$root_path/bin/test/";
             opendir (TESTAPPDIR, "$test_path") or die "Couldn't open test app dir";
             @files = <TESTAPPDIR>;
             while ($testapp = readdir TESTAPPDIR) {
                 my $test_app_path = $_[0];
                 my $parameters = $_[1];
-                print "executing: $cmd_prefix$test_app_path $parameters\n";
+                print "executing: $test_app_path $parameters\n";
                 my $file_handle = system("$test_app_path $parameters");
                 my $exit_status = $? >> 8;
-            #    print "exit: $exit_status \n";
+                print "\texit status: $exit_status handle: $file_handle\n";
-            #    print "handle: $file_handle\n";
             }