diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 4019edbe885941e6c8956e8196096cc83941063a..5f1ab66527a4209d2dbde92d33879f013891b8e4 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -37,5 +37,10 @@ jar { into "../frameworks/inspectIT/" rename('benchmark.jar', 'MooBench.jar') } + copy { + from jar + into "../frameworks/Kieker/" + rename('benchmark.jar', 'MooBench.jar') + } } } diff --git a/frameworks/Kieker/scripts/benchmark.sh b/frameworks/Kieker/scripts/benchmark.sh index 02eb06a7496910b39d65e3571c48a9adb7123ada..5fedaa4aac1f12a8cf022484491d5a42955df34b 100755 --- a/frameworks/Kieker/scripts/benchmark.sh +++ b/frameworks/Kieker/scripts/benchmark.sh @@ -51,7 +51,6 @@ checkDirectory DATA_DIR "${DATA_DIR}" create PARENT=`dirname "${RESULTS_DIR}"` checkDirectory result-base "$PARENT" checkFile ApsectJ-Agent "${AGENT}" -checkFile moobench "${BENCHMARK}" information "----------------------------------" information "Running benchmark..." @@ -138,10 +137,10 @@ function execute-experiment() { BENCHMARK_OPTS="${JAVA_ARGS} ${LTW_ARGS} ${KIEKER_ARGS} ${kieker_parameters}" fi - echo ${BENCHMARK}" "${BENCHMARK_OPTS}" moobench.benchmark.BenchmarkMain" + echo ${BENCHMARK_OPTS}" -jar benchmark/build/libs/benchmark.jar" - ${BENCHMARK} ${BENCHMARK_OPTS} moobench.benchmark.BenchmarkMain \ - --application moobench.application.MonitoredClassSimple \ + ${JAVABIN}java ${BENCHMARK_OPTS} -jar benchmark/build/libs/benchmark.jar \ + --application moobench.application.MonitoredClassSimple \ --output-filename ${RAWFN}-${loop}-${recursion}-${index}.csv \ --total-calls ${TOTAL_NUM_OF_CALLS} \ --method-time ${METHOD_TIME} \ diff --git a/frameworks/Kieker/scripts/config b/frameworks/Kieker/scripts/config index 6486f0fa674fb30bb592722319b024be9e97dae6..927b73687344de711285af779d50a13b4cc7740b 100644 --- a/frameworks/Kieker/scripts/config +++ b/frameworks/Kieker/scripts/config @@ -8,7 +8,6 @@ RSCRIPT_PATH="../../stats.csv.r" DATA_DIR="${BASE_DIR}/data" AGENT="${BASE_DIR}/kieker-1.15-SNAPSHOT-aspectj.jar" -BENCHMARK="${BASE_DIR}/benchmark/bin/benchmark" BATCH_MODE="yes" diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh index 83e1e5087efefa054cc6d4edf92c4a16dedbf2a0..f790a100c83a02633a093428763138f48273f284 100755 --- a/frameworks/inspectIT/benchmark.sh +++ b/frameworks/inspectIT/benchmark.sh @@ -151,6 +151,4 @@ run-r ## Clean up raw results zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}* -rm -f ${RAWFN}* -[ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR} -[ -f ${BASE_DIR}nohup.out ] && > ${BASE_DIR}nohup.out +rm ${RAWFN}*