sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-tests: Prefix remaining environment variables with CTDB_

Browse Source 
Now they are clearly all part of CTDB.

TEST_SOCKET_WRAPPER_SO_PATH gets too long in
integration_local_daemons.bash, so change it to
CTDB_TEST_SWRAP_SO_PATH instead of just prefixing.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2019-10-17 16:33:48 +11:00 committed by Ralph Boehme
parent e8dc125ed2
commit fe80038d07
11 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/README
View File

@ -23,7 +23,7 @@ By default:
* INTEGRATION tests are run against 3 local daemons
Set TEST_LOCAL_DAEMONS to a different number if desired
Set CTDB_TEST_LOCAL_DAEMONS to a different number if desired
* When testing is complete, a summary showing a list is printed
showing the tests run and their results

2
ctdb/tests/UNIT/eventd/scripts/local.sh
View File

@ -4,7 +4,7 @@
PATH="$PATH:$CTDB_SCRIPTS_TOOLS_HELPER_DIR"
if "$TEST_VERBOSE" ; then
if "$CTDB_TEST_VERBOSE" ; then
debug () { echo "$@" ; }
else
debug () { : ; }

2
ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
View File

@ -389,7 +389,7 @@ EOF
fi
_out=$(simple_test 2>&1)
_ret=$?
if "$TEST_VERBOSE" || [ $_ret -ne 0 ] ; then
if "$CTDB_TEST_VERBOSE" || [ $_ret -ne 0 ] ; then
cat <<EOF
##################################################
Iteration ${_iteration}:

2
ctdb/tests/UNIT/eventscripts/scripts/local.sh
View File

@ -49,7 +49,7 @@ mkdir -p "$FAKE_NETWORK_STATE"
######################################################################
if "$TEST_VERBOSE" ; then
if "$CTDB_TEST_VERBOSE" ; then
debug ()
{
if [ -n "$1" ] ; then

2
ctdb/tests/UNIT/onnode/scripts/local.sh
View File

@ -48,7 +48,7 @@ simple_test ()
_sort="sort"
fi
if $TEST_COMMAND_TRACE ; then
if $CTDB_TEST_COMMAND_TRACE ; then
_onnode=$(which "$1") ; shift
_out=$(bash -x "$_onnode" "$@" 2>&1)
else

2
ctdb/tests/UNIT/takeover_helper/scripts/local.sh
View File

@ -1,6 +1,6 @@
# Hey Emacs, this is a -*- shell-script -*- !!! :-)
if "$TEST_VERBOSE" ; then
if "$CTDB_TEST_VERBOSE" ; then
debug () { echo "$@" ; }
else
debug () { : ; }

2
ctdb/tests/UNIT/tool/scripts/local.sh
View File

@ -6,7 +6,7 @@ PATH="${PATH}:${CTDB_SCRIPTS_HELPER_BINDIR}"
setup_ctdb_base "$CTDB_TEST_TMP_DIR" "ctdb-etc" \
functions
if "$TEST_VERBOSE" ; then
if "$CTDB_TEST_VERBOSE" ; then
debug () { echo "$@" ; }
else
debug () { : ; }

30
ctdb/tests/run_tests.sh
View File

@ -41,33 +41,33 @@ test_state_dir=""
cleanup=false
test_time_limit=3600
export TEST_VERBOSE=false
export TEST_COMMAND_TRACE=false
export TEST_CAT_RESULTS_OPTS=""
export TEST_DIFF_RESULTS=false
export CTDB_TEST_VERBOSE=false
export CTDB_TEST_COMMAND_TRACE=false
export CTDB_TEST_CAT_RESULTS_OPTS=""
export CTDB_TEST_DIFF_RESULTS=false
export CTDB_TEST_PRINT_LOGS_ON_ERROR=false
export TEST_LOCAL_DAEMONS
[ -n "$TEST_LOCAL_DAEMONS" ] || TEST_LOCAL_DAEMONS=3
export TEST_SOCKET_WRAPPER_SO_PATH=""
export CTDB_TEST_LOCAL_DAEMONS
[ -n "$CTDB_TEST_LOCAL_DAEMONS" ] || CTDB_TEST_LOCAL_DAEMONS=3
export CTDB_TEST_SWRAP_SO_PATH=""
while getopts "AcCDehHI:LNqS:T:vV:xX?" opt ; do
case "$opt" in
A) TEST_CAT_RESULTS_OPTS="-A" ;;
c) TEST_LOCAL_DAEMONS="" ;;
A) CTDB_TEST_CAT_RESULTS_OPTS="-A" ;;
c) CTDB_TEST_LOCAL_DAEMONS="" ;;
C) cleanup=true ;;
D) TEST_DIFF_RESULTS=true ;;
D) CTDB_TEST_DIFF_RESULTS=true ;;
e) exit_on_fail=true ;;
H) no_header=true ;;
I) max_iterations="$OPTARG" ; exit_on_fail=true ; with_summary=false ;;
L) CTDB_TEST_PRINT_LOGS_ON_ERROR=true ;;
N) with_summary=false ;;
q) quiet=true ;;
S) TEST_SOCKET_WRAPPER_SO_PATH="$OPTARG" ;;
S) CTDB_TEST_SWRAP_SO_PATH="$OPTARG" ;;
T) test_time_limit="$OPTARG" ;;
v) TEST_VERBOSE=true ;;
v) CTDB_TEST_VERBOSE=true ;;
V) test_state_dir="$OPTARG" ;;
x) set -x ;;
X) TEST_COMMAND_TRACE=true ;;
X) CTDB_TEST_COMMAND_TRACE=true ;;
\?|h) usage ;;
esac
done
@ -76,7 +76,7 @@ shift $((OPTIND - 1))
case $(basename "$0") in
*run_cluster_tests*)
# Running on a cluster... same as -c
TEST_LOCAL_DAEMONS=""
CTDB_TEST_LOCAL_DAEMONS=""
;;
esac
@ -321,7 +321,7 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts"
# If no tests specified then run some defaults
if [ -z "$1" ] ; then
if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
if [ -n "$CTDB_TEST_LOCAL_DAEMONS" ] ; then
set -- UNIT INTEGRATION
else
set -- INTEGRATION CLUSTER

2
ctdb/tests/scripts/integration.bash
View File

@ -25,7 +25,7 @@ PATH="${TEST_SCRIPTS_DIR}:${PATH}"
ctdb_test_on_cluster ()
{
[ -z "$TEST_LOCAL_DAEMONS" ]
[ -z "$CTDB_TEST_LOCAL_DAEMONS" ]
}
ctdb_test_exit ()

6
ctdb/tests/scripts/integration_local_daemons.bash
View File

@ -24,9 +24,9 @@ setup_ctdb ()
esac
$ctdb_local_daemons setup "$@" \
-n "$TEST_LOCAL_DAEMONS" \
-n "$CTDB_TEST_LOCAL_DAEMONS" \
${CTDB_USE_IPV6:+-6} \
${TEST_SOCKET_WRAPPER_SO_PATH:+-S ${TEST_SOCKET_WRAPPER_SO_PATH}}
${CTDB_TEST_SWRAP_SO_PATH:+-S ${CTDB_TEST_SWRAP_SO_PATH}}
# Burying the above in an if-statement condition reduces readability.
# shellcheck disable=SC2181
if [ $? -ne 0 ] ; then
@ -35,7 +35,7 @@ setup_ctdb ()
if $no_event_scripts ; then
local pnn
for pnn in $(seq 0 $((TEST_LOCAL_DAEMONS - 1))) ; do
for pnn in $(seq 0 $((CTDB_TEST_LOCAL_DAEMONS - 1))) ; do
rm -vf "${CTDB_BASE}/events/legacy/"*
done
fi

14
ctdb/tests/scripts/unit.sh
View File

@ -74,7 +74,7 @@ result_print ()
_out="$2"
_rc="$3"
if "$TEST_VERBOSE" || ! $_passed ; then
if "$CTDB_TEST_VERBOSE" || ! $_passed ; then
extra_header
cat <<EOF
@ -83,7 +83,7 @@ Output (Exit status: ${_rc}):
--------------------------------------------------
EOF
# Avoid echo, which might expand unintentional escapes
printf '%s\n' "$_out" | result_filter | cat $TEST_CAT_RESULTS_OPTS
printf '%s\n' "$_out" | result_filter | cat $CTDB_TEST_CAT_RESULTS_OPTS
fi
if ! $_passed ; then
@ -93,9 +93,9 @@ Required output (Exit status: ${required_rc}):
--------------------------------------------------
EOF
# Avoid echo, which might expand unintentional escapes
printf '%s\n' "$required_output" | cat $TEST_CAT_RESULTS_OPTS
printf '%s\n' "$required_output" | cat $CTDB_TEST_CAT_RESULTS_OPTS
if $TEST_DIFF_RESULTS ; then
if $CTDB_TEST_DIFF_RESULTS ; then
_outr=$(mktemp)
# Avoid echo, which might expand unintentional escapes
printf '%s\n' "$required_output" >"$_outr"
@ -119,7 +119,7 @@ result_footer ()
{
_passed="$1"
if "$TEST_VERBOSE" || ! $_passed ; then
if "$CTDB_TEST_VERBOSE" || ! $_passed ; then
extra_footer
fi
@ -196,7 +196,7 @@ unit_test ()
test_header "$@"
_wrapper="$VALGRIND"
if $TEST_COMMAND_TRACE ; then
if $CTDB_TEST_COMMAND_TRACE ; then
_wrapper="strace"
fi
_out=$($_wrapper "$@" 2>&1)
@ -210,7 +210,7 @@ script_test ()
test_header "$@"
_shell=""
if ${TEST_COMMAND_TRACE} ; then
if ${CTDB_TEST_COMMAND_TRACE} ; then
_shell="sh -x"
else
_shell="sh"