]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
testing: fix hadoop-internal-test
authorJoe Buck <jbbuck@gmail.com>
Tue, 26 Mar 2013 21:17:14 +0000 (14:17 -0700)
committerJoe Buck <jbbuck@gmail.com>
Tue, 26 Mar 2013 23:08:51 +0000 (16:08 -0700)
Remove now superfluous directory changes
that are causing tests to fail.
This code should have been removed when we transitioned
from running tests with Ant to using Java to run the tests.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
qa/workunits/hadoop-internal-tests/test.sh

index c40055e210b1aac07d7eb605262a586d752f9ffa..48a9224dac17d10fe9ea04d3fec3cf0c53ae9953 100755 (executable)
@@ -64,15 +64,11 @@ cust_repl_conf=`mktemp`
 echo generating custom replication hadoop config $cust_repl_conf
 gen_hadoop_conf $cust_repl_conf $POOL_NAMES $conf
 
-pushd $TESTDIR/apache_hadoop
-
 echo running default replication hadoop tests
 java -Dhadoop.conf.file=$def_repl_conf -Djava.library.path=$ld_lib_path -cp /usr/share/java/junit4.jar:$TESTDIR/apache_hadoop/build/hadoop-core-1.0.4-SNAPSHOT.jar:$TESTDIR/inktank_hadoop/build/hadoop-cephfs.jar:$TESTDIR/inktank_hadoop/build/hadoop-cephfs-test.jar:$TESTDIR/apache_hadoop/build/hadoop-test-1.0.4-SNAPSHOT.jar:$TESTDIR/apache_hadoop/build/ivy/lib/Hadoop/common/commons-logging-1.1.1.jar:/usr/share/java/libcephfs.jar org.junit.runner.JUnitCore org.apache.hadoop.fs.ceph.TestCephDefaultReplication 
 
 echo running custom replication hadoop tests
 java -Dhadoop.conf.file=$cust_repl_conf -Djava.library.path=$ld_lib_path -cp /usr/share/java/junit4.jar:$TESTDIR/apache_hadoop/build/hadoop-core-1.0.4-SNAPSHOT.jar:$TESTDIR/inktank_hadoop/build/hadoop-cephfs.jar:$TESTDIR/inktank_hadoop/build/hadoop-cephfs-test.jar:$TESTDIR/apache_hadoop/build/hadoop-test-1.0.4-SNAPSHOT.jar:$TESTDIR/apache_hadoop/build/ivy/lib/Hadoop/common/commons-logging-1.1.1.jar:/usr/share/java/libcephfs.jar org.junit.runner.JUnitCore org.apache.hadoop.fs.ceph.TestCephCustomReplication 
 
-popd
-
 echo "completed hadoop-internal-tests tests"
 exit 0