diff options
| author | Andrew McDermott <andrew.mcdermott@linaro.org> | 2014-07-16 15:31:21 +0100 |
|---|---|---|
| committer | Andrew McDermott <andrew.mcdermott@linaro.org> | 2014-07-16 15:31:21 +0100 |
| commit | 556e0fa6ead2fd19f5469f26afb9af84d3d25341 (patch) | |
| tree | 5ac9cd0589970e4c9a9e696d3902defcd3472613 | |
| parent | 8ad4c4f6ec2a3544d827a631f01e77f3aa1e16b0 (diff) | |
benchmark-terasort: don't assume hadoop_dir is a submodule
Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
| -rwxr-xr-x | benchmark-terasort | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/benchmark-terasort b/benchmark-terasort index 28136ae..3bce708 100755 --- a/benchmark-terasort +++ b/benchmark-terasort @@ -27,9 +27,9 @@ if [ ! -d $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB ]; then exit 1 fi -if [ ! -d $THIS_BENCHMARK_DIR/openjdk8-hadoop-LCA14 ]; then - echo "error: openjdk8-hadoop-LCA14 directory is missing; run: git submodule update --init" -fi +: ${HADOOP_DIR:?"HADOOP_DIR not set; cannot continue"} + +ls -d ${HADOOP_DIR} || exit 1 record=0 @@ -51,10 +51,10 @@ done shift $((OPTIND - 1)) -sed -i '/^export JAVA_HOME=/d' $THIS_BENCHMARK_DIR/openjdk8-hadoop-LCA14/conf/hadoop-env.sh -echo "export JAVA_HOME=$1" >> $THIS_BENCHMARK_DIR/openjdk8-hadoop-LCA14/conf/hadoop-env.sh +sed -i '/^export JAVA_HOME=/d' $HADOOP_DIR/conf/hadoop-env.sh +echo "export JAVA_HOME=$1" >> $HADOOP_DIR/conf/hadoop-env.sh -cd $THIS_BENCHMARK_DIR/openjdk8-hadoop-LCA14 +cd $HADOOP_DIR . env.sh PATH=$1/bin:$PATH |