Merge pull request #48 from c0s/spec-tests

Fixing YNATIVE & HNATIVE. Removing the path pattern for directories

Merging in after an offline conversation about.

2 files changed, 4 insertions, 30 deletions

diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.li b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.li
deleted file mode 100644
index 7677cd16..00000000
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.li
+++ /dev/null
@@ -1,22 +0,0 @@
-netty-3.6.2.Final.jar
-leveldbjni-all-1.8.jar
-paranamer-2.3.jar
-jackson-core-asl-1.9.13.jar
-jersey-server-1.9.jar
-guice-3.0.jar
-avro-1.7.4.jar
-log4j-1.2.17.jar
-jackson-mapper-asl-1.9.13.jar
-snappy-java-1.0.4.1.jar
-jersey-core-1.9.jar
-jersey-guice-1.9.jar
-commons-compress-1.4.1.jar
-junit-4.11.jar
-xz-1.0.jar
-asm-3.2.jar
-aopalliance-1.0.jar
-javax.inject-1.jar
-protobuf-java-2.5.0.jar
-commons-io-2.4.jar
-hamcrest-core-1.3.jar
-guice-servlet-3.0.jar
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy b/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
index 80b32edc..682ee6f0 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
@@ -24,7 +24,6 @@ specs {
       arguments {
         envcmd = 'hadoop envvars'
         variable = 'JAVA_HOME'
-        pattern = /.*\/usr\/.*/
       }
     }
     'HADOOP_EC1' {
@@ -42,7 +41,6 @@ specs {
       arguments {
         envcmd = 'hadoop envvars'
         variable = 'HADOOP_COMMON_HOME'
-        pattern = /.*\/usr\/lib\/hadoop.*/
       }
     }
     'HADOOP_EC3' {
@@ -69,7 +67,6 @@ specs {
       arguments {
         envcmd = 'hadoop envvars'
         variable = 'HADOOP_CONF_DIR'
-        pattern = /.*\/etc\/hadoop.*/
       }
     }
     'HADOOP_EH1' {
@@ -78,7 +75,6 @@ specs {
       arguments {
         envcmd = 'hdfs envvars'
         variable = 'HADOOP_HDFS_HOME'
-        pattern = /.*\/usr\/lib\/hadoop-hdfs.*/
       }
     }
     'HADOOP_EH2' {
@@ -105,7 +101,6 @@ specs {
       arguments {
         envcmd = 'yarn envvars'
         variable = 'HADOOP_YARN_HOME'
-        pattern = /.*\/usr\/lib\/hadoop-yarn.*/
       }
     }
     'HADOOP_EY2' {
@@ -132,7 +127,6 @@ specs {
       arguments {
         envcmd = 'mapred envvars'
         variable = 'HADOOP_MAPRED_HOME'
-        pattern = /.*\/usr\/lib\/hadoop-mapreduce.*/
       }
     }
     'HADOOP_EM2' {
@@ -339,7 +333,8 @@ specs {
       name = 'HADOOP_HNATIVE1'
       type = 'shell'
       arguments {
-        command = 'test -e $HADOOP_COMMON_HOME/lib/native/libhdfs.a'
+        command = '[ ! -n ${HADOOP_COMMON_HOME} ] || HADOOP_COMMON_HOME=`hadoop envvars | grep HADOOP_COMMON_HOME | sed "s/.*=\'\\(.*\\)\'/\\1/"`; '+
+            'test -e $HADOOP_COMMON_HOME/lib/native/libhdfs.a'
         message = 'hadoop-hdfs-project must be build with -Pnative or -Pnative-win'
       }
     }
@@ -347,7 +342,8 @@ specs {
       name = 'HADOOP_YNATIVE1'
       type = 'shell'
       arguments {
-        command = 'test -e $HADOOP_YARN_HOME/bin/container-executor'
+        command = '[ ! -n ${HADOOP_YARN_HOME} ] || HADOOP_YARN_HOME=`yarn envvars | grep HADOOP_YARN_HOME | sed "s/.*=\'\\(.*\\)\'/\\1/"`; '+
+            'echo $HADOOP_YARN_HOME; test -e $HADOOP_YARN_HOME/bin/container-executor'
         message = 'hadoop-yarn-project must be build with -Pnative or -Pnative-win'
       }
     }