svn commit: r1487967 - in /pig/trunk: CHANGES.txt test/e2e/harness/TestDriver.pm test/e2e/pig/drivers/TestDriverPig.pm

[da...@apache.org]

Author: daijy
Date: Thu May 30 18:48:41 2013
New Revision: 1487967

URL: http://svn.apache.org/r1487967
Log:
PIG-3337: Fix remaining Window e2e tests

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/e2e/harness/TestDriver.pm
    pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1487967&r1=1487966&r2=1487967&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu May 30 18:48:41 2013
@@ -192,6 +192,8 @@ PIG-3013: BinInterSedes improve chararra
 
 BUG FIXES
 
+PIG-3337: Fix remaining Window e2e tests (daijy)
+
 PIG-3328: DataBags created with an initial list of tuples don't get registered as spillable (mwagner via daijy)
 
 PIG-3313: pig job hang if the job tracker is bounced during execution (yu.chenjie via daijy)

Modified: pig/trunk/test/e2e/harness/TestDriver.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/harness/TestDriver.pm?rev=1487967&r1=1487966&r2=1487967&view=diff
==============================================================================
--- pig/trunk/test/e2e/harness/TestDriver.pm (original)
+++ pig/trunk/test/e2e/harness/TestDriver.pm Thu May 30 18:48:41 2013
@@ -499,7 +499,7 @@ sub run
 
         # Run the group of tests.
         # NB: the processing of $localStartAt parameter happens only if the groupForkFactor < 1.
-        my $sawStart = $self -> runTestGroup($groupName, $subLog, $confFile, \%globalHash, $group, $runAll, $testsToRun, $testsToMatch, $localStartAt, $testStatuses, $productForkFactor);
+        my $sawStart = $self -> runTestGroup($groupName, $subLog, $confFile, \%globalHash, $group, $runAll, $testsToRun, $testsToMatch, $localStartAt, $testStatuses, $productForkFactor, $resources);
         if ((defined $localStartAt) && $sawStart) {
             undef $localStartAt;
         }
@@ -548,7 +548,7 @@ sub globalCleanupConditionalIf() {
 # Returns: 'true' if the test defined by '$startat' was found, and 'false' otherwise.
 #   (If the '$startat' is null, always returns true.)   
 sub runTestGroup() {
-        my ($self, $groupName, $subLog, $confFile, $globalHash, $group, $runAll, $testsToRun, $testsToMatch, $startat, $testStatuses, $productForkFactor) = @_;
+        my ($self, $groupName, $subLog, $confFile, $globalHash, $group, $runAll, $testsToRun, $testsToMatch, $startat, $testStatuses, $productForkFactor, $resources) = @_;
 
         my $subName = (caller(0))[3];
         print $subLog "INFO $subName at ".__LINE__.": Running TEST GROUP(".$groupName.")\n";

Modified: pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm?rev=1487967&r1=1487966&r2=1487967&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm Thu May 30 18:48:41 2013
@@ -385,9 +385,13 @@ sub getPigCmd($$$)
     my @pigCmd;
 
     # set the PIG_CLASSPATH environment variable
+	my $separator = ":";
+	if(Util::isWindows()) {
+	    $separator = ";";
+	}
 	my $pcp .= $testCmd->{'jythonjar'} if (defined($testCmd->{'jythonjar'}));
-    $pcp .= ":" . $testCmd->{'jrubyjar'} if (defined($testCmd->{'jrubyjar'}));
-    $pcp .= ":" . $testCmd->{'classpath'} if (defined($testCmd->{'classpath'}));
+    $pcp .= $separator . $testCmd->{'jrubyjar'} if (defined($testCmd->{'jrubyjar'}));
+    $pcp .= $separator . $testCmd->{'classpath'} if (defined($testCmd->{'classpath'}));
 
     # Set it in our current environment.  It will get inherited by the IPC::Run
     # command.