| @@ -24,21 +24,26 mkdir $reports_path; | |||||
| 24 | # setup environment for running tests |
|
24 | # setup environment for running tests | |
| 25 | given ($job{'Platform'}) { |
|
25 | given ($job{'Platform'}) { | |
| 26 |
|
26 | |||
| 27 |
|
|
27 | when ("Win7") { | |
| 28 |
|
|
28 | # Add qtdir to path | |
| 29 |
|
|
29 | $ENV{'PATH'} .= ";" . $job{'QtDir'} . "\\bin"; | |
| 30 |
|
||||
| 31 | # replace / -> \ |
|
|||
| 32 | $ENV{'PATH'} =~ s/\//\\/g; |
|
|||
| 33 | } |
|
|||
| 34 |
|
30 | |||
| 35 | when ("Linux") { |
|
31 | # replace / -> \ | |
| 36 | # Add qtdir to path |
|
32 | $ENV{'PATH'} =~ s/\//\\/g; | |
| 37 | $ENV{'PATH'} = $job{'QtDir'} . "/bin:" . $ENV{'PATH'}; |
|
33 | } | |
| 38 |
|
34 | |||
| 39 | # If this is not set we get "cannot connect to X server" errors |
|
35 | when ("Linux") { | |
| 40 | $ENV{'DISPLAY'} = ":0.0"; |
|
36 | # Add qtdir to path | |
| 41 | } |
|
37 | $ENV{'PATH'} = $job{'QtDir'} . "/bin:" . $ENV{'PATH'}; | |
|
|
38 | ||||
|
|
39 | # If this is not set we get "cannot connect to X server" errors | |||
|
|
40 | $ENV{'DISPLAY'} = ":0.0"; | |||
|
|
41 | } | |||
|
|
42 | ||||
|
|
43 | when ("Mac") { | |||
|
|
44 | # Set QML_IMPORT_PATH point to QML plugin dir | |||
|
|
45 | $ENV{'QML_IMPORT_PATH'} = $bin_path; | |||
|
|
46 | } | |||
| 42 | } |
|
47 | } | |
| 43 |
|
48 | |||
| 44 | # Go through all the files in the test folder |
|
49 | # Go through all the files in the test folder | |
General Comments 0
You need to be logged in to leave comments.
Login now