diff options
| author | Mihaela Kedikova <misheto@openoffice.org> | 2010-04-27 18:10:24 +0200 |
|---|---|---|
| committer | Mihaela Kedikova <misheto@openoffice.org> | 2010-04-27 18:10:24 +0200 |
| commit | 39ca8c85709c3c329736d1a3d5309224e323eaf2 (patch) | |
| tree | 4ccd36e277bbaa609537993dd7c0f11a37c52099 /automation | |
| parent | 591628e221db19e0ebe86208bea9c522c8c9c629 (diff) | |
| parent | eed1a4cbf0088d8ceb45a1eabfe166226bf17695 (diff) | |
gridcontrol_03: merge with DEV300_m77
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/testtool/filter.pl | 20 | ||||
| -rw-r--r-- | automation/source/testtool/makefile.mk | 5 |
2 files changed, 1 insertions, 24 deletions
diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl index 79b7add5c5b3..8f45073b0934 100644 --- a/automation/source/testtool/filter.pl +++ b/automation/source/testtool/filter.pl @@ -71,28 +71,13 @@ sub read_block { print "Leaving read_block at the end\n" if $debug; } -sub convert_path { - - $_ = $_[0]; - $GUI = $ENV {"GUI"}; - $use_shell = $ENV {"USE_SHELL"}; - if ( $GUI eq "WNT" ) - { - if ( defined( $use_shell ) && "$use_shell" eq "4nt" ) - { - s/\//\\/g; - } - } - $_; -} - # Read a file. # first parameter ist the filename sub read_file { local ($filename,$file) = @_; $file++; # String increment - local $TempFileName = &convert_path( $basename."/".$filename ); + local $TempFileName = $basename."/".$filename; print "reading file $TempFileName as $file\n" if $debug; open($file, $TempFileName) || die "error: Could not open file $TempFileName. "; @@ -103,9 +88,6 @@ sub read_file { # main starts here -print &convert_path ("/\n\n\n") if ( $debug ); - - $basename = "."; $basename = $ARGV[0] if defined($ARGV[0]); diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk index 962f9d6e2694..db8464130c1b 100644 --- a/automation/source/testtool/makefile.mk +++ b/automation/source/testtool/makefile.mk @@ -87,13 +87,8 @@ $(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/ $(MISC)$/xfilter.pl : filter.pl -.IF "$(GUI)" == "UNX" || "$(USE_SHELL)"!="4nt" tr -d "\015" < filter.pl > $(MISC)$/xfilter.pl chmod 664 $(MISC)$/xfilter.pl -.ELSE - $(COPY) filter.pl $(MISC)$/xfilter.pl - attrib -r $(MISC)$/xfilter.pl -.ENDIF |