Skip to content

Commit d4187bd

Browse files
committed
Merge branch 'es/perf-export-fix'
Dev-support fix for BSD. * es/perf-export-fix: t/perf: fix test_export() failure with BSD `sed`
2 parents 21fa5bb + f469873 commit d4187bd

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

t/perf/perf-lib.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,18 @@ test_run_perf_ () {
148148
. '"$TEST_DIRECTORY"/test-lib-functions.sh'
149149
test_export () {
150150
[ $# != 0 ] || return 0
151-
test_export_="$test_export_\\|$1"
151+
test_export_="$test_export_ $1"
152152
shift
153153
test_export "$@"
154154
}
155155
'"$1"'
156156
ret=$?
157-
set | sed -n "s'"/'/'\\\\''/g"';s/^\\($test_export_\\)/export '"'&'"'/p" >test_vars
157+
needles=
158+
for v in $test_export_
159+
do
160+
needles="$needles;s/^$v=/export $v=/p"
161+
done
162+
set | sed -n "s'"/'/'\\\\''/g"'$needles" >test_vars
158163
exit $ret' >&3 2>&4
159164
eval_ret=$?
160165

0 commit comments

Comments
 (0)