Author: rvs
Date: Thu Jun 7 18:00:26 2012
New Revision: 1347740
URL: http://svn.apache.org/viewvc?rev=1347740&view=rev
Log:
BIGTOP-616. Fix TestHadoopSmoke and TestHadoopExamples: tests look for
streaming and examples jar in wrong directory (Stephen Chu via rvs)
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopexamples/TestHadoopExamples.groovy
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopsmoke/TestHadoopSmoke.groovy
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopexamples/TestHadoopExamples.groovy
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopexamples/TestHadoopExamples.groovy?rev=1347740&r1=1347739&r2=1347740&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopexamples/TestHadoopExamples.groovy
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopexamples/TestHadoopExamples.groovy
Thu Jun 7 18:00:26 2012
@@ -36,19 +36,19 @@ import org.junit.runner.RunWith
class TestHadoopExamples {
static private Log LOG = LogFactory.getLog(TestHadoopExamples.class);
- private static final String HADOOP_HOME = System.getenv('HADOOP_HOME');
+ private static final String HADOOP_MAPRED_HOME =
System.getenv('HADOOP_MAPRED_HOME');
private static final String HADOOP_CONF_DIR =
System.getenv('HADOOP_CONF_DIR');
private static String hadoopExamplesJar =
- JarContent.getJarName(HADOOP_HOME, 'hadoop.*examples.*.jar');
+ JarContent.getJarName(HADOOP_MAPRED_HOME, 'hadoop.*examples.*.jar');
static {
- assertNotNull("HADOOP_HOME has to be set to run this test",
- HADOOP_HOME);
+ assertNotNull("HADOOP_MAPRED_HOME has to be set to run this test",
+ HADOOP_MAPRED_HOME);
assertNotNull("HADOOP_CONF_DIR has to be set to run this test",
HADOOP_CONF_DIR);
assertNotNull("Can't find hadoop-examples.jar file", hadoopExamplesJar);
}
static final String HADOOP_EXAMPLES_JAR =
- HADOOP_HOME + "/" + hadoopExamplesJar;
+ HADOOP_MAPRED_HOME + "/" + hadoopExamplesJar;
static Shell sh = new Shell("/bin/bash -s");
private static final String EXAMPLES = "examples";
Modified:
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopsmoke/TestHadoopSmoke.groovy
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopsmoke/TestHadoopSmoke.groovy?rev=1347740&r1=1347739&r2=1347740&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopsmoke/TestHadoopSmoke.groovy
(original)
+++
incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopsmoke/TestHadoopSmoke.groovy
Thu Jun 7 18:00:26 2012
@@ -34,8 +34,9 @@ class TestHadoopSmoke {
static String hadoopHome = System.getProperty('HADOOP_HOME',
'/usr/lib/hadoop')
static String streamingHome = System.getenv('STREAMING_HOME')
+ static String hadoopMapReduceHome = System.getProperty('HADOOP_MAPRED_HOME',
'/usr/lib/hadoop-mapreduce')
static final String STREAMING_HOME =
- (streamingHome == null) ? hadoopHome + "/contrib/streaming" :
streamingHome;
+ (streamingHome == null) ? hadoopMapReduceHome : streamingHome;
static String streaming_jar =
JarContent.getJarName(STREAMING_HOME, 'hadoop.*streaming.*.jar');
static {
