You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/05/28 20:22:48 UTC
svn commit: r1598102 - in /pig/trunk: CHANGES.txt
test/e2e/pig/conf/default.conf
test/e2e/pig/deployers/ExistingClusterDeployer.pm
test/e2e/pig/drivers/TestDriverPig.pm test/e2e/pig/drivers/Util.pm
Author: daijy
Date: Wed May 28 18:22:48 2014
New Revision: 1598102
URL: http://svn.apache.org/r1598102
Log:
PIG-3752: Fix e2e Parallel test for Windows
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/pig/conf/default.conf
pig/trunk/test/e2e/pig/deployers/ExistingClusterDeployer.pm
pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
pig/trunk/test/e2e/pig/drivers/Util.pm
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1598102&r1=1598101&r2=1598102&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed May 28 18:22:48 2014
@@ -42,6 +42,8 @@ PIG-2207: Support custom counters for ag
IMPROVEMENTS
+PIG-3752: Fix e2e Parallel test for Windows (daijy)
+
PIG-3966: Document variable input arguments of UDFs (lbendig via aniket486)
PIG-3963: Documentation for BagToString UDF (mrflip via daijy)
Modified: pig/trunk/test/e2e/pig/conf/default.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/conf/default.conf?rev=1598102&r1=1598101&r2=1598102&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/conf/default.conf (original)
+++ pig/trunk/test/e2e/pig/conf/default.conf Wed May 28 18:22:48 2014
@@ -15,7 +15,7 @@
# limitations under the License.
my $me = `whoami`;
-chomp $me;
+$me =~ s/[^a-zA-Z0-9]*//g;
# The contents of this file can be rewritten to fit your installation.
# Also, you can define the following environment variables and set things up as in the test setup
@@ -43,7 +43,7 @@ $cfg = {
#TEST
, 'benchmarkPath' => "$ENV{PH_OUT}/benchmarks"
, 'scriptPath' => "$ENV{PH_ROOT}/libexec"
- , 'tmpPath' => '/tmp/pigtest'
+ , 'tmpPath' => 'tmp/pigtest'
, 'jythonjar' => "$ENV{PH_JYTHON_JAR}"
, 'jrubyjar' => "$ENV{PH_JRUBY_JAR}"
Modified: pig/trunk/test/e2e/pig/deployers/ExistingClusterDeployer.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/deployers/ExistingClusterDeployer.pm?rev=1598102&r1=1598101&r2=1598102&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/deployers/ExistingClusterDeployer.pm (original)
+++ pig/trunk/test/e2e/pig/deployers/ExistingClusterDeployer.pm Wed May 28 18:22:48 2014
@@ -22,6 +22,8 @@ use TestDeployer;
use strict;
use English;
+use Util;
+
our @ISA = "TestDeployer";
###########################################################################
@@ -354,11 +356,18 @@ sub runPigCmd($$$$)
my @pigCmd = "";
+ my $pigbin = "";
if ($cfg->{'usePython'} eq "true") {
- @pigCmd = ("$cfg->{'pigpath'}/bin/pig.py");
+ $pigbin = "$cfg->{'pigpath'}/bin/pig.py";
+ } elsif (Util::isCygwin()) {
+ $pigbin = "$cfg->{'pigpath'}/bin/pig.cmd";
+ $pigbin =~ s/\\/\//g;
+ $pigbin = `cygpath -u $pigbin`;
+ chomp($pigbin);
} else {
- @pigCmd = ("$cfg->{'pigpath'}/bin/pig");
+ $pigbin = "$cfg->{'pigpath'}/bin/pig";
}
+ @pigCmd = ($pigbin);
push(@pigCmd, '-e');
push(@pigCmd, split(' ', $c));
Modified: pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm?rev=1598102&r1=1598101&r2=1598102&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/TestDriverPig.pm Wed May 28 18:22:48 2014
@@ -113,7 +113,7 @@ sub globalSetup
# Setup the output path
my $me = `whoami`;
- chomp $me;
+ $me =~ s/[^a-zA-Z0-9]*//g;
my $jobId = $globalHash->{'job-id'};
my $timeId = time;
$globalHash->{'runid'} = $me . "-" . $timeId . "-" . $jobId;
@@ -202,7 +202,7 @@ sub runTest
if ( $testCmd->{'pig'} && $self->hasCommandLineVerifications( $testCmd, $log) ) {
my $oldpig;
- if ( Util::isWindows() && $testCmd->{'pig_win'}) {
+ if ((Util::isWindows() || Util::isCygwin()) && $testCmd->{'pig_win'}) {
$oldpig = $testCmd->{'pig'};
$testCmd->{'pig'} = $testCmd->{'pig_win'};
}
@@ -222,7 +222,7 @@ sub runTest
} elsif( $testCmd->{'pig'} ){
my $oldpig;
- if ( Util::isWindows() && $testCmd->{'pig_win'}) {
+ if ((Util::isWindows() || Util::isCygwin()) && $testCmd->{'pig_win'}) {
$oldpig = $testCmd->{'pig'};
$testCmd->{'pig'} = $testCmd->{'pig_win'};
}
@@ -308,7 +308,9 @@ sub runPigCmdLine
$result{'rc'} = $? >> 8;
$result{'output'} = $outfile;
$result{'stdout'} = `cat $stdoutfile`;
+ $result{'stdout'} =~ s/\r\n/\n/g;
$result{'stderr'} = `cat $stderrfile`;
+ $result{'stderr'} =~ s/\r\n/\n/g;
$result{'stderr_file'} = $stderrfile;
print $log "STD ERROR CONTAINS:\n$result{'stderr'}\n";
@@ -387,7 +389,7 @@ sub getPigCmd($$$)
# set the PIG_CLASSPATH environment variable
my $separator = ":";
- if(Util::isWindows()) {
+ if(Util::isWindows()||Util::isCygwin()) {
$separator = ";";
}
my $pcp .= $testCmd->{'jythonjar'} if (defined($testCmd->{'jythonjar'}));
@@ -403,12 +405,19 @@ sub getPigCmd($$$)
push(@pigCmd, "$testCmd->{'pigpath'}/bin/pig.py");
# print ("Using pig too\n");
} else {
+ my $pigbin = "";
if(Util::isWindows()) {
- @pigCmd = ("$testCmd->{'pigpath'}/bin/pig.cmd");
+ $pigbin = "$testCmd->{'pigpath'}/bin/pig.cmd";
}
- else {
- @pigCmd = ("$testCmd->{'pigpath'}/bin/pig");
+ elsif (Util::isCygwin()) {
+ $pigbin = "$testCmd->{'pigpath'}/bin/pig.cmd";
+ $pigbin =~ s/\\/\//g;
+ $pigbin = `cygpath -u $pigbin`;
+ chomp($pigbin);
+ } else {
+ $pigbin = "$testCmd->{'pigpath'}/bin/pig";
}
+ @pigCmd = ($pigbin);
}
if (defined($testCmd->{'additionaljars'})) {
@@ -646,7 +655,7 @@ sub generateBenchmark
$modifiedTestCmd{'pig'} = $testCmd->{'verify_pig_script'};
}
else {
- if ( Util::isWindows() && $testCmd->{'pig_win'}) {
+ if ((Util::isWindows()||Util::isCygwin()) && $testCmd->{'pig_win'}) {
$modifiedTestCmd{'pig'} = $testCmd->{'pig_win'};
}
# Change so we're looking at the old version of Pig
Modified: pig/trunk/test/e2e/pig/drivers/Util.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/Util.pm?rev=1598102&r1=1598101&r2=1598102&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/Util.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/Util.pm Wed May 28 18:22:48 2014
@@ -466,4 +466,15 @@ sub isWindows
return 0;
}
}
+
+sub isCygwin
+{
+ if($^O =~ /cygwin/i) {
+ return 1;
+ }
+ else {
+ return 0;
+ }
+}
+
1;