diff --git a/perf/specjbb/README.md b/perf/specjbb/README.md
index 44d6fa05a4..978ea6334c 100644
--- a/perf/specjbb/README.md
+++ b/perf/specjbb/README.md
@@ -28,7 +28,7 @@ export SPECJBB_SRC=/Users/aqa-tester/SPECjbb2015-1.03
## Run
-The configuration currently includes one group, `extended`, and that group contains one test, `specjbb-multijvm-simple`. You can use the following commands to run it:
+The configuration currently includes one group, `extended`, and that group contains one test, `SPECjbb2015-multijvm-simple`. You can use the following commands to run it:
```
-make _testList TESTLIST=specjbb-multijvm-simple
+make _testList TESTLIST=SPECjbb2015-multijvm-simple
```
\ No newline at end of file
diff --git a/perf/specjbb/build.xml b/perf/specjbb/build.xml
index 1b770ad4de..cde6290d9b 100644
--- a/perf/specjbb/build.xml
+++ b/perf/specjbb/build.xml
@@ -21,38 +21,84 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
diff --git a/perf/specjbb/build/getSpecjbbSuite.sh b/perf/specjbb/build/getSpecjbbSuite.sh
deleted file mode 100644
index 4c5d37afaa..0000000000
--- a/perf/specjbb/build/getSpecjbbSuite.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-# Validate and copy the directory containing the SPECjbb jar file SPECJBB_SRC to the build directory SPECJBB_DEST
-
-SUCCESS=0
-ERROR=1
-
-exists() {
- local specjbb_dir=$1
- return $(test -f "${specjbb_dir}/${SPECJBB_JAR}")
-}
-
-isRunnable() {
- local specjbb_dir=$1
- result=$(${JAVA_BIN} -jar ${specjbb_dir}/${SPECJBB_JAR} -v | grep -q "SPECjbb2015") > /dev/null 2>&1
- return $result
-}
-
-dirIsValid(){
- local specjbb_dir=$1
-
- if exists $specjbb_dir; then
- if isRunnable $specjbb_dir; then
- return $SUCCESS
- fi
- fi
-
- return $ERROR
-}
-
-dstIsValid(){
- echo "##### Validating destination SPECjbb dir"
- return $(dirIsValid $SPECJBB_DEST)
-}
-
-srcIsValid(){
- echo "##### Validating source SPECjbb dir"
- return $(dirIsValid $SPECJBB_SRC)
-}
-
-copySrcToDst(){
- echo "##### Copying contents of source SPECjbb dir to destination SPECjbb dir"
- cp -a $SPECJBB_SRC/. $SPECJBB_DEST
-}
-
-succeed(){
- echo "##### SUCCESS"
- exit $SUCCESS
-}
-
-fail(){
- echo "##### FAIL"
- exit $ERROR
-}
-
-main(){
- if srcIsValid; then
- copySrcToDst
- if dstIsValid; then
- succeed
- fi
- else
- echo "##### Source suite is not valid"
- fi
-
- fail
-}
-
-printInput(){
- echo "++ SPECJBB_SRC ${SPECJBB_SRC}"
- echo "++ SPECJBB_DEST ${SPECJBB_DEST}"
- echo "++ SPECJBB_JAR ${SPECJBB_JAR}"
- echo "++ JAVA_BIN ${JAVA_BIN}"
-}
-
-printInput
-main
-
diff --git a/perf/specjbb/playlist.xml b/perf/specjbb/playlist.xml
index e2f4aaaac3..b28f6ba7d1 100644
--- a/perf/specjbb/playlist.xml
+++ b/perf/specjbb/playlist.xml
@@ -15,8 +15,8 @@
run/testenv.mk
- specjbb-multijvm-simple
- source $(RUN_OPTIONS)/specjbb-multijvm-simple.sh; bash $(RUN_SCRIPTS)/run_multi.sh; $(TEST_STATUS)
+ SPECjbb2015-multijvm-simple
+ . $(RUN_OPTIONS)/specjbb-multijvm-simple.sh; bash $(RUN_SCRIPTS)/run_multi.sh; $(TEST_STATUS)
extended
diff --git a/perf/specjbb/run/run_multi.sh b/perf/specjbb/run/run_multi.sh
index 51b7ddc169..90df2b5b3d 100755
--- a/perf/specjbb/run/run_multi.sh
+++ b/perf/specjbb/run/run_multi.sh
@@ -27,7 +27,7 @@ for ((n=1; $n<=$NUM_OF_RUNS; n=$n+1)); do
JAVA="${JAVA%\"}"
JAVA="${JAVA#\"}"
echo "Start Controller JVM"
- $JAVA $JAVA_OPTS_C $SPECJBB_OPTS_C -jar $SPECJBB_JAR -m MULTICONTROLLER $MODE_ARGS_C 2>controller.log > controller.out &
+ $JAVA $JAVA_OPTS_C $SPECJBB_OPTS_C -jar $SPECJBB_JAR -m MULTICONTROLLER $MODE_ARGS_C 2>controller.log 2>&1 | tee controller.out &
CTRL_PID=$!
echo "Controller PID = $CTRL_PID"