diff options
author | Darren Tucker <dtucker@dtucker.net> | 2020-04-22 11:33:15 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-04-22 11:35:49 +1000 |
commit | 300c4322b92e98d3346efa0aec1c094c94d0f964 (patch) | |
tree | deb4a9b9f00d32d51879a4bfc60bed93e4c47c64 /regress | |
parent | c8d9796cfe046f00eb8b2096d2b7028d6a523a84 (diff) |
Pass configure's egrep through to test-exec.sh.
Use it to create a wrapper function to call it from tests. Fixes the
keygen-comment test on platforms with impoverished default egrep (eg
Solaris).
Diffstat (limited to 'regress')
-rw-r--r-- | regress/test-exec.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 62f5dfc46..bfe8783fe 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -23,6 +23,16 @@ else | |||
23 | PORT=4242 | 23 | PORT=4242 |
24 | fi | 24 | fi |
25 | 25 | ||
26 | # If configure tells us to use a different egrep, create a wrapper function | ||
27 | # to call it. This means we don't need to change all the tests that depend | ||
28 | # on a good implementation. | ||
29 | if test "x${EGREP}" != "x"; then | ||
30 | egrep () | ||
31 | { | ||
32 | ${EGREP} "$@" | ||
33 | } | ||
34 | fi | ||
35 | |||
26 | if [ -x /usr/ucb/whoami ]; then | 36 | if [ -x /usr/ucb/whoami ]; then |
27 | USER=`/usr/ucb/whoami` | 37 | USER=`/usr/ucb/whoami` |
28 | elif whoami >/dev/null 2>&1; then | 38 | elif whoami >/dev/null 2>&1; then |