diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 10:40:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 10:40:45 +0000 |
| commit | b45a584af3b2f6d97dcf88068e8e8092b795f8b0 (patch) | |
| tree | 599dcf89966d22b0414bebc754cb1c5118957c50 | |
| parent | ba70354f6c0296c074cda77db5425fc505c23eda (diff) | |
INTEGRATION: CWS smoketest16_SRC680 (1.20.4.3.2); FILE MERGED
2007/01/30 17:57:42 kz 1.20.4.3.2.1: #i74026# alternative install methode not on cygwin
| -rwxr-xr-x | smoketestoo_native/smoketest.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl index 83b263ff51e7..44c814adc4ed 100755 --- a/smoketestoo_native/smoketest.pl +++ b/smoketestoo_native/smoketest.pl @@ -7,9 +7,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: smoketest.pl,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: obo $ $Date: 2007-01-25 16:11:56 $ +# last change: $Author: vg $ $Date: 2007-02-05 11:40:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -256,7 +256,7 @@ if ( $ARGV[0] ) { ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -$id_str = ' $Revision: 1.23 $ '; +$id_str = ' $Revision: 1.24 $ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); @@ -712,7 +712,7 @@ sub getInstset { my ($INSTSET, $NEWINSTSET); my (@DirArray, $InstDir, $RootDir, $TestDir1, $TestDir2); - if (defined ($ENV{EPM}) && ($ENV{EPM} eq 'NO')) { # we do the install ourselves ... + if (defined ($ENV{EPM}) && ($ENV{EPM} eq 'NO') && ($gui eq "UNX")) { # we do the install ourselves ... return (); } |