File tree Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ do-plumbing-add-deps() {
18
18
19
19
# Install transitive dependencies
20
20
local subDep=" $BPM_PACKAGES_PATH /$id "
21
- if [[ ! -d " $subDep " && -n " ${BPM_MODE_TEST +x} " ]]; then
21
+ if [[ ! -d " $subDep " && -n " ${BPM_IS_TEST +x} " ]]; then
22
22
# During some tests, plumbing-* or Git commands may be stubbed,
23
23
# so the package may not actually be cloned
24
24
return
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ do-plumbing-clone() {
35
35
exit 1
36
36
fi
37
37
38
- if [ -n " ${BPM_MODE_TEST +x} " ]; then
38
+ if [ -n " ${BPM_IS_TEST +x} " ]; then
39
39
printf " %s\n" " $git_output "
40
40
fi
41
41
@@ -52,7 +52,7 @@ do-plumbing-clone() {
52
52
exit 1
53
53
fi
54
54
55
- if [ -n " ${BPM_MODE_TEST +x} " ]; then
55
+ if [ -n " ${BPM_IS_TEST +x} " ]; then
56
56
printf " %s\n" " $git_output "
57
57
fi
58
58
fi
Original file line number Diff line number Diff line change @@ -121,7 +121,7 @@ do_actual_upgrade() {
121
121
exit 1
122
122
fi
123
123
124
- if [ -n " ${BPM_MODE_TEST +x} " ]; then
124
+ if [ -n " ${BPM_IS_TEST +x} " ]; then
125
125
printf " %s\n" " $git_output "
126
126
fi
127
127
Original file line number Diff line number Diff line change @@ -273,7 +273,7 @@ util.setup_mode() {
273
273
if project_root_dir=" $( util.get_project_root_dir) " ; then
274
274
# Output to standard error because some subcommands may be scriptable (ex. list)
275
275
log.info " Operating in context of local bpm.toml" >&2
276
- if [ " ${BPM_MODE_TEST +x} " ]; then
276
+ if [ " ${BPM_IS_TEST +x} " ]; then
277
277
printf " -> %s\n" " '$project_root_dir '"
278
278
fi
279
279
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ load 'util/init.sh'
64
64
65
65
do-upgrade " $site /$pkg "
66
66
67
- unset BPM_MODE_TEST
67
+ unset BPM_IS_TEST
68
68
run do-upgrade " $pkg "
69
69
70
70
assert_success
Original file line number Diff line number Diff line change @@ -15,8 +15,7 @@ export XDG_DATA_HOME=
15
15
# Test-specific
16
16
export BPM_TEST_DIR=" $BATS_TMPDIR /bpm"
17
17
export BPM_ORIGIN_DIR=" $BPM_TEST_DIR /origin"
18
- export BPM_MODE_TEST=
19
- export BPM_MODE=' global' # normal default is 'local'
18
+ export BPM_IS_TEST=
20
19
21
20
# Stub common variables
22
21
export PROGRAM_LIB_DIR=" $BPM_ROOT /source/pkg/lib"
@@ -27,14 +26,15 @@ export BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
27
26
export BPM_INSTALL_BIN=" $BPM_PREFIX /bin"
28
27
export BPM_INSTALL_MAN=" $BPM_PREFIX /man"
29
28
export BPM_INSTALL_COMPLETIONS=" $BPM_PREFIX /completions"
29
+ export BPM_MODE=' global' # normal default is 'local'
30
30
31
31
export PATH=" $BPM_ROOT /source/pkg/bin:$PATH "
32
32
for f in " $BPM_ROOT " /source/pkg/lib/{commands,util}/?* .sh; do
33
33
source " $f "
34
34
done
35
35
36
36
setup () {
37
- mkdir -p " $BPM_TEST_DIR " " $BATS_TEST_TMPDIR " " $ BPM_ORIGIN_DIR"
37
+ mkdir -p " $BPM_TEST_DIR " " $BPM_ORIGIN_DIR "
38
38
cd " $BATS_TEST_TMPDIR "
39
39
}
40
40
You can’t perform that action at this time.
0 commit comments