Skip to content

Commit 1f85d22

Browse files
committed
Improve tps testing infrastructure: rename some functions to prevent name clash, step 1
1 parent 7e188c3 commit 1f85d22

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

tests/capture-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
set -euo pipefail
33

4-
pushdq_here
4+
_TT_pushdq_here
55

66
run_bash_on "*/capture-all.sh" "$@"
77

8-
popdq
8+
_TT_popdq

tests/test-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
set -euo pipefail
33

4-
pushdq_here
4+
_TT_pushdq_here
55

66
run_bash_on "*/test-all.sh" "$@"
77

8-
popdq
8+
_TT_popdq

tests/utils/general.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,16 @@ function absolute_path {
126126
fi
127127
}
128128

129-
function pushdq {
129+
function _TT_pushdq {
130130
pushd "$@" > /dev/null
131131
}
132132

133-
function popdq {
133+
function _TT_popdq {
134134
popd > /dev/null
135135
}
136136

137-
function pushdq_here {
138-
pushdq "$(dirname "$0")"
137+
function _TT_pushdq_here {
138+
_TT_pushdq "$(dirname "$0")"
139139
}
140140

141141

tests/utils/testing.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ function pop_test_context {
4242

4343

4444
function pushd_test_context {
45-
pushdq_here
45+
_TT_pushdq_here
4646
push_test_context "$@"
4747
}
4848

4949
function pushd_test_context_here {
50-
pushdq_here
50+
_TT_pushdq_here
5151
push_test_context "$(basename ${PWD})"
5252
}
5353

5454
function popd_test_context {
55-
popdq
55+
_TT_popdq
5656
pop_test_context "$@"
5757
}
5858

@@ -411,7 +411,7 @@ function __exec__run_command__ {
411411
local -ra command_array=("${abs_command}")
412412
fi
413413

414-
pushdq "${abs_working_directory}"
414+
_TT_pushdq "${abs_working_directory}"
415415
rm -f "${exec_abs_variables}"
416416
touch "${exec_abs_variables}"
417417
exec_return_code=0
@@ -440,7 +440,7 @@ function __exec__run_command__ {
440440
done > "${exec_abs_variables}"
441441
exit "${exec_return_code}"
442442
) || exec_return_code=$?
443-
popdq
443+
_TT_popdq
444444
}
445445

446446
function expect_exec {

0 commit comments

Comments
 (0)