summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorJoe Buck <jbbuck@gmail.com>2013-03-11 22:19:24 -0700
committerJoe Buck <jbbuck@gmail.com>2013-03-11 23:41:27 -0700
commit09fa711093920e55bdf5c7c9fd762b0f2744fbfc (patch)
tree82d5af8d47f309610976aebf46b42dbcf047f2a2 /qa
parent936b8f20af1d390976097c427b6e92da4b39b218 (diff)
downloadceph-09fa711093920e55bdf5c7c9fd762b0f2744fbfc.tar.gz
testing: fix hadoop-internal-tests
The hadoop-internal-tests workunit needs to be updated in light of our moving to using stock Hadoop with our hadoop-cephfs jars. Signed-off-by: Joe Buck <jbbuck@gmail.com>
Diffstat (limited to 'qa')
-rwxr-xr-xqa/workunits/hadoop-internal-tests/test.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/workunits/hadoop-internal-tests/test.sh b/qa/workunits/hadoop-internal-tests/test.sh
index a446f770cf8..c40055e210b 100755
--- a/qa/workunits/hadoop-internal-tests/test.sh
+++ b/qa/workunits/hadoop-internal-tests/test.sh
@@ -64,13 +64,13 @@ cust_repl_conf=`mktemp`
echo generating custom replication hadoop config $cust_repl_conf
gen_hadoop_conf $cust_repl_conf $POOL_NAMES $conf
-pushd $TESTDIR/hadoop
+pushd $TESTDIR/apache_hadoop
echo running default replication hadoop tests
-ant -Dextra.library.path=$ld_lib_path -Dhadoop.conf.file=$def_repl_conf -Dtestcase=TestCephDefaultReplication test
+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
-ant -Dextra.library.path=$ld_lib_path -Dhadoop.conf.file=$cust_repl_conf -Dtestcase=TestCephCustomReplication test
+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