mholz 2003/12/30 01:40:27
Modified: testsuite/bin TErrorsReport.pl TProcessor.pl
Log:
Modify perl scripts to run on Linux. They should still run
on MS Win.
Revision Changes Path
1.2 +13 -8 jakarta-slide/testsuite/bin/TErrorsReport.pl
Index: TErrorsReport.pl
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TErrorsReport.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TErrorsReport.pl 16 Jul 2003 07:08:48 -0000 1.1
+++ TErrorsReport.pl 30 Dec 2003 09:40:27 -0000 1.2
@@ -25,7 +25,7 @@
$OPTS="-Dxdav.home=\"$TP_HOME\" -Xms100M -Xmx200M";
if (!$ER_INFILE) {
- $ER_INFILE="-infile
$TP_HOME"."$PD"."testsuite"."$PD"."junit"."$PD"."testcasesresults.xml";
+ $ER_INFILE="-infile
$TP_HOME"."$PD"."testsuite"."$PD"."junit"."$PD"."testCasesResults.xml";
}
if (!$ER_OUTFILE) {
$ER_OUTFILE="-outfile
$TP_HOME"."$PD"."testsuite"."$PD"."junit"."$PD"."testErrorsReport.txt";
@@ -53,18 +53,23 @@
}
sub cpbuild {
- $path=$_[0];
- $CP="";
+ my $path=$_[0];
+ my $CP="";
print "Appending $path and all jar files contained in $path to the
classpath...\n\n";
- $wrk=$ENV{"CLASSPATH"};
- $ENV{"CLASSPATH"}="$wrk".";$path";
+
+ my $SEP=":";
+ if ($^O eq "MSWin32") {
+ $SEP=";";
+ }
+ my $wrk=$ENV{"CLASSPATH"};
+ $ENV{"CLASSPATH"}=$wrk.$SEP.$path;
opendir (JD, "$path") || die "Cannot open $path";
foreach (readdir(JD)) {
next if (substr($_, length($_) - 4, length($_)) ne ".jar");
- if (!$CP) {$CP="$path"."$PD"."$_";}
- else {$CP="$CP".";$path$PD$_";}
+ if (!$CP) {$CP=$path.$PD.$_}
+ else {$CP=$CP.$SEP.$path.$PD.$_}
}
- $ENV{"CLASSPATH"}=$ENV{"CLASSPATH"}.";$CP";
+ $ENV{"CLASSPATH"}=$ENV{"CLASSPATH"}.$SEP.$CP;
closedir JD;
}
1.3 +42 -31 jakarta-slide/testsuite/bin/TProcessor.pl
Index: TProcessor.pl
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TProcessor.pl 11 Aug 2003 14:51:15 -0000 1.2
+++ TProcessor.pl 30 Dec 2003 09:40:27 -0000 1.3
@@ -14,34 +14,36 @@
# (7) TP_WORKDB internal DB name for the store configuration required for the
webdav and I18N testcases ... :-(
# (8) TP_WORKHOST internal host name the internal DB for the store
configuration required for the webdav and I18N testcases ... :-(
-use STRICT;
+use strict;
-$TP_WORKDB="xdavtest";
-$TP_WORKHOST="localhost";
-$DAV_HOST="localhost";
-$DAV_AUTH="os";
-$DAV_GROUP="group";
-$DAV_DOMAIN="localhost";
-$DAV_USER="guest";
-$DAV_PASSWORD="guest";
-$DAV_PORT="4000";
-$DAV_NAME="slide";
-$TP_STORE="files";
-$TP_USERS="10";
-$TP_ITERATIONS="10";
-$TESTCASE_PATH="";
-$TESTCASE_PATTERN="";
-$PAR="";
+my $TP_WORKDB="xdavtest";
+my $TP_WORKHOST="localhost";
+my $DAV_HOST="localhost";
+my $DAV_AUTH="os";
+my $DAV_GROUP="group";
+my $DAV_DOMAIN="localhost";
+my $DAV_USER="guest";
+my $DAV_PASSWORD="guest";
+my $DAV_PORT="4000";
+my $DAV_NAME="slide";
+my $TP_STORE="files";
+my $TP_USERS="10";
+my $TP_ITERATIONS="10";
+my $TESTCASE_PATH="";
+my $TESTCASE_PATTERN="";
+my $PAR="";
+my $PD="/";
if ($^O eq "MSWin32") {
$PD="\\";
-} else {
- $PD="/";
}
+my $TP_HOME;
if ($TP_HOME eq "") {
$TP_HOME="..";
}
+
+my $TESTCASE_EXCLUDE;
# Process parms
while (@ARGV && ($_ = $ARGV[0])){
$_ =~ tr/\//-/; # allow slash as option identifier
@@ -67,7 +69,11 @@
shift;
}
-$TP_ITER_SMALL=int ($TP_ITERATIONS/2);
+my $TP_ITER_SMALL=int ($TP_ITERATIONS/2);
+
+my $ROOT_USER_PATH;
+my $USER_PATH;
+my $ACTION_PATH;
if ("$DAV_AUTH" eq "none") {
$ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
@@ -103,11 +109,12 @@
$ACTION_PATH="/$DAV_NAME/administration/security/actions";
}
-$OPTS="-Dxdav.home=\"$TP_HOME\" -Dxdav.host=$DAV_HOST -Dxdav.port=$DAV_PORT
-Dxdav.user=$DAV_USER -Dxdav.password=$DAV_PASSWORD
-Dxdav.globalVariableDomainName=$DAV_DOMAIN -Dxdav.globalVariableGroupsColl=groups
-Dxdav.globalVariableUsersColl=users -Dxdav.globalVariableRolesColl=roles
-Dxdav.globalVariableGroup=$DAV_GROUP
-Dxdav.globalVariableRootUserPath=$ROOT_USER_PATH
-Dxdav.globalVariableUserPath=$USER_PATH -Dxdav.globalVariableServerName=$DAV_NAME
-Dxdav.globalVariableCollection=$TP_STORE -Dxdav.globalVariableUsers=$TP_USERS
-Dxdav.globalVariableIterationCount=$TP_ITERATIONS
-Dxdav.globalVariableIterationCountSmall=$TP_ITER_SMALL
-Dxdav.globalVariablePerformanceIterations=$TP_ITER_SMALL -Dxdav.urlencoding=UTF-8
-Dxdav.workdb=$TP_WORKDB -Dxdav.workhost=$TP_WORKHOST
-Dhttpclient.authentication.preemptive=true";
+my $OPTS="-Dxdav.home=\"$TP_HOME\" -Dxdav.host=$DAV_HOST -Dxdav.port=$DAV_PORT
-Dxdav.user=$DAV_USER -Dxdav.password=$DAV_PASSWORD
-Dxdav.globalVariableDomainName=$DAV_DOMAIN -Dxdav.globalVariableGroupsColl=groups
-Dxdav.globalVariableUsersColl=users -Dxdav.globalVariableRolesColl=roles
-Dxdav.globalVariableGroup=$DAV_GROUP
-Dxdav.globalVariableRootUserPath=$ROOT_USER_PATH
-Dxdav.globalVariableUserPath=$USER_PATH -Dxdav.globalVariableServerName=$DAV_NAME
-Dxdav.globalVariableCollection=$TP_STORE -Dxdav.globalVariableUsers=$TP_USERS
-Dxdav.globalVariableIterationCount=$TP_ITERATIONS
-Dxdav.globalVariableIterationCountSmall=$TP_ITER_SMALL
-Dxdav.globalVariablePerformanceIterations=$TP_ITER_SMALL -Dxdav.urlencoding=UTF-8
-Dxdav.workdb=$TP_WORKDB -Dxdav.workhost=$TP_WORKHOST
-Dhttpclient.authentication.preemptive=true";
$ENV{"CLASSPATH"}="";
cpbuild("$TP_HOME"."$PD"."lib");
+my $CLS;
if ("$TESTCASE_PATH") {
$CLS="org.apache.slide.testsuite.testtools.tprocessor.TProcessors -name
$TP_HOME$PD$TESTCASE_PATH";
}
@@ -122,8 +129,8 @@
$PAR="org.apache.slide.testsuite.testtools.walker.TProcessorTestExecuter";
}
-$JH=$ENV{"JAVA_HOME"};
-$CMD="$JH"."$PD"."bin"."$PD"."java";
+my $JH=$ENV{"JAVA_HOME"};
+my $CMD="$JH"."$PD"."bin"."$PD"."java";
# print ("\"$CMD\" $OPTS $CLS $PAR\n");
print ("$CMD $OPTS $CLS $PAR\n");
system ("$CMD $OPTS $CLS $PAR");
@@ -169,18 +176,22 @@
}
sub cpbuild {
- $path=$_[0];
- $CP="";
+ my $path=$_[0];
+ my $CP="";
print "Appending $path and all jar files contained in $path to the
classpath...\n\n";
- $wrk=$ENV{"CLASSPATH"};
- $ENV{"CLASSPATH"}="$wrk".";$path";
- print ("Opening \"$path\"\n");
+
+ my $SEP=":";
+ if ($^O eq "MSWin32") {
+ $SEP=";";
+ }
+ my $wrk=$ENV{"CLASSPATH"};
+ $ENV{"CLASSPATH"}=$wrk.$SEP.$path;
opendir (JD, "$path") || die "Cannot open $path";
foreach (readdir(JD)) {
next if (substr($_, length($_) - 4, length($_)) ne ".jar");
- if (!$CP) {$CP="$path"."$PD"."$_";}
- else {$CP="$CP".";$path$PD$_";}
+ if (!$CP) {$CP=$path.$PD.$_}
+ else {$CP=$CP.$SEP.$path.$PD.$_}
}
- $ENV{"CLASSPATH"}=$ENV{"CLASSPATH"}.";$CP";
+ $ENV{"CLASSPATH"}=$ENV{"CLASSPATH"}.$SEP.$CP;
closedir JD;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
