Commit 6f8c433c authored by Kristupas Bobraitis's avatar Kristupas Bobraitis
Browse files

Use 'jmeter_v' in 'run_tests.sh'

parent fc8ed19f
......@@ -74,7 +74,7 @@ install_jmeter() {
}
run_tests() {
./tests/run_tests.sh $1
./tests/run_tests.sh $jmeter_v $1
}
recreate_db() {
......@@ -126,9 +126,9 @@ elif [ "$1" = "install-postgrest" ]; then
elif [ "$1" = "install-jmeter" ]; then
install_jmeter
elif [ "$1" = "test" ]; then
run_tests
run_tests $jmeter_v
elif [ "$1" = "test-py" ]; then
run_tests "py"
run_tests $jmeter_v "py"
elif [ "$1" = "start" ]; then
start_webserver
elif [ "$1" = "start-py" ]; then
......
#!/bin/bash
if [ "$1" = "py" ]; then
jmeter_v=$1
if [ "$2" = "py" ]; then
TEST_SCENARIO_PATH="$(pwd)/tests/performance/test_scenarios_py.jmx"
else
TEST_SCENARIO_PATH="$(pwd)/tests/performance/test_scenarios.jmx"
......@@ -12,13 +14,13 @@ TEST_REPORT_PATH="$(pwd)/tests/performance/result_report/index.html"
run_performance_tests() {
rm $TEST_RESULT_PATH
jmeter-5.3 -n -t $TEST_SCENARIO_PATH -l $TEST_RESULT_PATH
jmeter-$jmeter_v -n -t $TEST_SCENARIO_PATH -l $TEST_RESULT_PATH
}
generate_performance_report() {
rm -rf $TEST_REPORT_DIR
mkdir $TEST_REPORT_DIR
jmeter-5.3 -g $TEST_RESULT_PATH -o $TEST_REPORT_DIR
jmeter-$jmeter_v -g $TEST_RESULT_PATH -o $TEST_REPORT_DIR
}
view_performance_result() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment