diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-19 02:15:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-19 02:15:18 +0300 |
| commit | d4187bd4d5091cf2700b0a954cbdc379e5d1248d (patch) | |
| tree | ae1c4d5a4bce77b49ee08a706cb324a69d476f52 | |
| parent | 21fa5bb9726e6627ae9925b48b1655ba9ac3dd0e (diff) | |
| parent | f4698738f9dbe733e64f968fff95a9a4f881431e (diff) | |
Merge branch 'es/perf-export-fix'
Dev-support fix for BSD.
* es/perf-export-fix:
t/perf: fix test_export() failure with BSD `sed`
| -rw-r--r-- | t/perf/perf-lib.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 821581a885..22d727cef8 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -148,13 +148,18 @@ test_run_perf_ () { . '"$TEST_DIRECTORY"/test-lib-functions.sh' test_export () { [ $# != 0 ] || return 0 - test_export_="$test_export_\\|$1" + test_export_="$test_export_ $1" shift test_export "$@" } '"$1"' ret=$? -set | sed -n "s'"/'/'\\\\''/g"';s/^\\($test_export_\\)/export '"'&'"'/p" >test_vars +needles= +for v in $test_export_ +do + needles="$needles;s/^$v=/export $v=/p" +done +set | sed -n "s'"/'/'\\\\''/g"'$needles" >test_vars exit $ret' >&3 2>&4 eval_ret=$? |