diff options
Diffstat (limited to 'testgraphical/source/graphical_compare.pm')
| -rw-r--r-- | testgraphical/source/graphical_compare.pm | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/testgraphical/source/graphical_compare.pm b/testgraphical/source/graphical_compare.pm index 5cde8d64ea01..d3ea8e90360d 100644 --- a/testgraphical/source/graphical_compare.pm +++ b/testgraphical/source/graphical_compare.pm @@ -3,7 +3,7 @@ package graphical_compare; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ sub getOOoRunnerClasspath() if (! -d $sSourceRoot ) { - log_print( "SourceRoot not found, search it in '$sSourceRoot'\n"); + log_print( "SourceRoot not found, search it in '$sSourceRoot'\n"); return ""; } @@ -112,8 +112,8 @@ sub getOOoRunnerClasspath() my $sJurtPath = $sSourceRootBin; my $sJuhPath = $sSourceRootBin; my $sJavaUnoPath = $sSourceRootBin; - - my $sOOoRunnerClasspath = + + my $sOOoRunnerClasspath = appendPath( $sRidlPath, "ridl.jar") . getJavaPathSeparator() . appendPath( $sUnoilPath, "unoil.jar") . getJavaPathSeparator() . appendPath( $sJurtPath, "jurt.jar") . getJavaPathSeparator() . @@ -182,7 +182,7 @@ sub searchForReference($) { return 0; } - return 1; + return 1; } # ------------------------------------------------------------------------------ @@ -232,7 +232,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # create postscript or pdf from second installed office # ------------------------------------------------------------------------------ - + my $sPathesIni = appendPath(getProjectOutput(), "pathes.ini"); my $gspath = getFromPathes($sPathesIni, "gs.path"); my $gsexe = getFromPathes($sPathesIni, "gs.exe"); @@ -247,7 +247,7 @@ sub SingleDocumentCompare($$$$$$) my $sInputPath = $sDocumentPoolPath; $sInputPath = appendPath($sInputPath, $sDocumentPool); $sInputPath = appendPath($sInputPath, $sDocumentName); - + if (! -f $sInputPath ) { $nConvwatchFailed = 1; @@ -302,13 +302,13 @@ sub SingleDocumentCompare($$$$$$) } $sParams .= " -cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -ini $sPropertyFile" . - " -o graphical.PostscriptCreator"; + " -o graphical.PostscriptCreator"; # $sParams .= " -cs pipe,name=$USER"; - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -351,12 +351,12 @@ sub SingleDocumentCompare($$$$$$) print("]\n"); return $nConvwatchFailed; } - + # ------------------------------------------------------------------------------ # create jpeg from postscript or pdf from second installed office # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- CREATE JPEG FROM POSTSCRIPT OR PDF FROM RUNNING OFFICE -----\n"); @@ -367,8 +367,8 @@ sub SingleDocumentCompare($$$$$$) my $sOutputPath = getProjectOutput(); my $sParams = "-cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . @@ -384,7 +384,7 @@ sub SingleDocumentCompare($$$$$$) { $sParams .= " -gs.exe $gsexe"; } - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -401,7 +401,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # create jpeg from postscript or pdf from references # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- CREATE JPEG FROM POSTSCRIPT OR PDF FROM REFERENCE -----\n"); @@ -409,7 +409,7 @@ sub SingleDocumentCompare($$$$$$) # start OOoRunner my $sInputPath = appendPath(getProjectRoot(), "references"); $sInputPath = appendPath($sInputPath, getEnvironment()); - $sInputPath = appendPath($sInputPath, $sDocumentPool); + $sInputPath = appendPath($sInputPath, $sDocumentPool); $sInputPath = appendPath($sInputPath, $sDocumentName); my $err = searchForReference($sInputPath); @@ -420,7 +420,7 @@ sub SingleDocumentCompare($$$$$$) } else { - my $sOutputPath = getProjectOutputReference(); + my $sOutputPath = getProjectOutputReference(); rmkdir $sOutputPath; my $sIndexFile = appendPath($sOutputPath, "index.ini"); @@ -435,8 +435,8 @@ sub SingleDocumentCompare($$$$$$) } } my $sParams = "-cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . @@ -452,7 +452,7 @@ sub SingleDocumentCompare($$$$$$) { $sParams .= " -gs.exe $gsexe"; } - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -468,7 +468,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # compare JPEGs # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- COMPARE JPEGS -----\n"); @@ -478,19 +478,19 @@ sub SingleDocumentCompare($$$$$$) my $sParams = "-Xmx512m" . " -cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . - " -NoOffice" . + " -NoOffice" . " -NoSmallPictures" . " -o graphical.JPEGComparator"; if ($impath) { $sParams .= " -imagemagick.path " . quoteIfNeed($impath); } - + # start OOoRunner # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); @@ -559,7 +559,7 @@ sub SingleDocumentCompare($$$$$$) my $sLogFile = appendPath(getProjectOutput(), $sDocumentName . ".txt"); showFile($sLogFile); } - # printTime(endTime($nSimpleCompareTime)); + # printTime(endTime($nSimpleCompareTime)); return $nConvwatchFailed; } |