This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 195195223 refactor(test): use semicolon instead of comma to separate
each option in TEST_OPTS (#1854)
195195223 is described below
commit 195195223be48cb0aa201d8a0d22c1550bac562b
Author: Samunroyu <[email protected]>
AuthorDate: Thu Jan 18 15:27:30 2024 +0800
refactor(test): use semicolon instead of comma to separate each option in
TEST_OPTS (#1854)
Now options in TEST_OPTS are separated by comma. However, some
options contains commas itself. We could use semicolon instead of
comma.
---
.github/workflows/lint_and_test_cpp.yaml | 2 +-
run.sh | 10 +++++-----
src/common/test/run.sh | 2 +-
src/meta/test/run.sh | 2 +-
src/replica/backup/test/run.sh | 2 +-
src/replica/bulk_load/test/run.sh | 2 +-
src/replica/duplication/test/run.sh | 2 +-
src/replica/split/test/run.sh | 2 +-
src/replica/storage/simple_kv/run.sh | 2 +-
src/replica/storage/simple_kv/test/run.sh | 6 +++---
src/replica/test/run.sh | 2 +-
src/server/test/run.sh | 2 +-
src/test/function_test/run.sh | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/lint_and_test_cpp.yaml
b/.github/workflows/lint_and_test_cpp.yaml
index 510508562..1a9cf2ff2 100644
--- a/.github/workflows/lint_and_test_cpp.yaml
+++ b/.github/workflows/lint_and_test_cpp.yaml
@@ -46,7 +46,7 @@ on:
env:
# Update the options to reduce the consumption of the disk space
ONEBOX_OPTS: disk_min_available_space_ratio=5
- TEST_OPTS:
disk_min_available_space_ratio=5,throttle_test_medium_value_kb=10,throttle_test_large_value_kb=25
+ TEST_OPTS:
disk_min_available_space_ratio=5;throttle_test_medium_value_kb=10;throttle_test_large_value_kb=25
jobs:
cpp_clang_format_linter:
diff --git a/run.sh b/run.sh
index dfae368f4..54a8502f7 100755
--- a/run.sh
+++ b/run.sh
@@ -484,16 +484,16 @@ function run_test()
# Update options if needed, this should be done before starting
onebox to make new options take effect.
if [ "${module}" == "recovery_test" ]; then
master_count=1
-
opts="meta_state_service_type=meta_state_service_simple,distributed_lock_service_type=distributed_lock_service_simple"
+
opts="meta_state_service_type=meta_state_service_simple;distributed_lock_service_type=distributed_lock_service_simple"
fi
if [ "${module}" == "backup_restore_test" ]; then
-
opts="cold_backup_disabled=false,cold_backup_checkpoint_reserve_minutes=0,cold_backup_root=onebox"
+
opts="cold_backup_disabled=false;cold_backup_checkpoint_reserve_minutes=0;cold_backup_root=onebox"
fi
if [ "${module}" == "restore_test" ]; then
-
opts="cold_backup_disabled=false,cold_backup_checkpoint_reserve_minutes=0,cold_backup_root=onebox"
+
opts="cold_backup_disabled=false;cold_backup_checkpoint_reserve_minutes=0;cold_backup_root=onebox"
fi
# Append onebox_opts if needed.
- [ -z ${onebox_opts} ] || opts="${opts},${onebox_opts}"
+ [ -z ${onebox_opts} ] || opts="${opts};${onebox_opts}"
# Start onebox.
if ! run_start_onebox -m ${master_count} -w -c --opts ${opts}; then
echo "ERROR: unable to continue on testing because starting
onebox failed"
@@ -844,7 +844,7 @@ function run_start_onebox()
fi
OPTS=`echo $OPTS | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/common/test/run.sh b/src/common/test/run.sh
index affb98db8..5a4f74c2a 100755
--- a/src/common/test/run.sh
+++ b/src/common/test/run.sh
@@ -38,7 +38,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/meta/test/run.sh b/src/meta/test/run.sh
index 207a9c7f8..fe9a11696 100755
--- a/src/meta/test/run.sh
+++ b/src/meta/test/run.sh
@@ -35,7 +35,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/replica/backup/test/run.sh b/src/replica/backup/test/run.sh
index 73aa02be9..eb8840494 100755
--- a/src/replica/backup/test/run.sh
+++ b/src/replica/backup/test/run.sh
@@ -30,7 +30,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/replica/bulk_load/test/run.sh
b/src/replica/bulk_load/test/run.sh
index 7b060300d..7689036b0 100755
--- a/src/replica/bulk_load/test/run.sh
+++ b/src/replica/bulk_load/test/run.sh
@@ -30,7 +30,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/replica/duplication/test/run.sh
b/src/replica/duplication/test/run.sh
index cf9d4b11e..90dee780d 100755
--- a/src/replica/duplication/test/run.sh
+++ b/src/replica/duplication/test/run.sh
@@ -30,7 +30,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/replica/split/test/run.sh b/src/replica/split/test/run.sh
index 71820b093..bd75b9619 100755
--- a/src/replica/split/test/run.sh
+++ b/src/replica/split/test/run.sh
@@ -30,7 +30,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/replica/storage/simple_kv/run.sh
b/src/replica/storage/simple_kv/run.sh
index 7669b4daf..cf7c0380c 100755
--- a/src/replica/storage/simple_kv/run.sh
+++ b/src/replica/storage/simple_kv/run.sh
@@ -36,7 +36,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/replica/storage/simple_kv/test/run.sh
b/src/replica/storage/simple_kv/test/run.sh
index 17affedf7..f63fba48a 100755
--- a/src/replica/storage/simple_kv/test/run.sh
+++ b/src/replica/storage/simple_kv/test/run.sh
@@ -37,7 +37,7 @@ function run_single()
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
@@ -113,12 +113,12 @@ fi
if [ ! -z "${cases}" ]; then
OLD_TEST_OPTS=${TEST_OPTS}
- TEST_OPTS=${OLD_TEST_OPTS},encrypt_data_at_rest=false
+ TEST_OPTS="${OLD_TEST_OPTS};encrypt_data_at_rest=false"
for id in ${cases}; do
run_case ${id}
echo
done
- TEST_OPTS=${OLD_TEST_OPTS},encrypt_data_at_rest=true
+ TEST_OPTS="${OLD_TEST_OPTS};encrypt_data_at_rest=true"
for id in ${cases}; do
run_case ${id}
echo
diff --git a/src/replica/test/run.sh b/src/replica/test/run.sh
index 12152709d..0b7e3f21b 100755
--- a/src/replica/test/run.sh
+++ b/src/replica/test/run.sh
@@ -35,7 +35,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/server/test/run.sh b/src/server/test/run.sh
index d8da4db1a..076e3c325 100755
--- a/src/server/test/run.sh
+++ b/src/server/test/run.sh
@@ -30,7 +30,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
diff --git a/src/test/function_test/run.sh b/src/test/function_test/run.sh
index 947cc35f8..952abf4ad 100755
--- a/src/test/function_test/run.sh
+++ b/src/test/function_test/run.sh
@@ -31,7 +31,7 @@ if [ -n ${TEST_OPTS} ]; then
fi
OPTS=`echo ${TEST_OPTS} | xargs`
- config_kvs=(${OPTS//,/ })
+ config_kvs=(${OPTS//;/ })
for config_kv in ${config_kvs[@]}; do
config_kv=`echo $config_kv | xargs`
kv=(${config_kv//=/ })
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
