diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-11-06 19:45:46 +0100 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-11-06 19:45:46 +0100 |
commit | 2116fef8e2ec48daea7badd58fdba0a202f8a675 (patch) | |
tree | 4a3b8888655826fa334f418055a0af2388e69d00 /smoketestoo_native | |
parent | Create DEV300_m63 milestone tag from trunk@277194 (diff) | |
download | core-2116fef8e2ec48daea7badd58fdba0a202f8a675.tar.gz core-2116fef8e2ec48daea7badd58fdba0a202f8a675.zip |
#i106687# adaptions for using source_config
Diffstat (limited to 'smoketestoo_native')
-rwxr-xr-x | smoketestoo_native/smoketest.pl | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index 8ee0b9efcf44..91f6ed681fc1 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -42,6 +42,7 @@ use File::Basename; use File::Path; use File::Copy; use Getopt::Long; +use SourceConfig; ######################## # # @@ -57,6 +58,7 @@ $is_do_deinstall = 0; $is_without_msiexec = 1; $is_oo = 1; +$sourceconfig_obj; $gui = $ENV{GUI}; $temp_path = $ENV{TEMP}; $vcsid = $ENV{VCSID}; @@ -860,12 +862,22 @@ sub getInstset { foreach $project (@install_list) { @DirArray=(); $TestDir1 = "$RootDir$project$PathSeparator$ENV{INPATH}$PathSeparator$PRODUCT$PathSeparator$packpackage$PathSeparator" . "install$PathSeparator"; - $TestDir2 = "$StandDir$project$PathSeparator$ENV{INPATH}$PathSeparator$PRODUCT$PathSeparator$packpackage$PathSeparator" . "install$PathSeparator"; if (-e "$TestDir1") { $InstDir= $TestDir1; } - elsif (-e "$TestDir2") { - $InstDir="$TestDir2"; + else { + $sourceconfig_obj = SourceConfig->new() if (!defined ($sourceconfig_obj)); + my $module_path = $sourceconfig_obj->get_module_path($project); + # only if module exists + if (defined ($module_path)) { + $TestDir2 = "$module_path$PathSeparator$ENV{INPATH}$PathSeparator$PRODUCT$PathSeparator$packpackage$PathSeparator" . "install$PathSeparator"; + } + else { + $TestDir2 = $module_path; + } + if (defined ($TestDir2) && -e "$TestDir2") { + $InstDir="$TestDir2"; + } } if ($InstDir eq "") { next; |