c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

OpenZFS 7290 - ZFS test suite needs to control what utilities it can run

Browse Source 
Authored by: John Wren Kennedy <john.kennedy@delphix.com>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

Porting Notes:
- Utilities which aren't available under Linux have been removed.
- Because of sudo's default secure path behavior PATH must be
  explicitly reset at the top of libtest.shlib.  This avoids the
  need for all users to customize secure path on their system.
- Updated ZoL infrastructure to manage constrained path
- Updated all test cases
- Check permissions for usergroup tests
- When testing in-tree create links under bin/
- Update fault cleanup such that missing files during
  cleanup aren't fatal.
- Configure su environment with constrained path

OpenZFS-issue: https://www.illumos.org/issues/7290
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/1d32ba6
Closes #5903
This commit is contained in:
John Wren Kennedy
2017-04-05 20:18:22 -04:00
committed by Brian Behlendorf
parent 7a4500a101
commit c1d9abf905
797 changed files with 8038 additions and 7458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test-runner/include/logapi.shlib
+11 -11
View File
@@ -94,10 +94,10 @@ function log_must_retry
while (( $retry > 0 )); do
"$@" 2>$logfile
status=$?
out="$CAT $logfile"
out="cat $logfile"
if (( $status == 0 )); then
$out | $EGREP -i "internal error|assertion failed" \
$out | egrep -i "internal error|assertion failed" \
> /dev/null 2>&1
# internal error or assertion failed
if [[ $? -eq 0 ]]; then
@@ -111,11 +111,11 @@ function log_must_retry
fi
break
else
$out | $GREP -i "$expect" > /dev/null 2>&1
$out | grep -i "$expect" > /dev/null 2>&1
if (( $? == 0 )); then
print -u2 $($out)
_printerror "$@" "Retry in $delay seconds"
$SLEEP $delay
sleep $delay
(( retry=retry - 1 ))
(( delay=delay * 2 ))
@@ -189,7 +189,7 @@ function log_neg_expect
"$@" 2>$logfile
typeset status=$?
out="$CAT $logfile"
out="cat $logfile"
# unexpected status
if (( $status == 0 )); then
@@ -208,7 +208,7 @@ function log_neg_expect
print -u2 $($out)
_printerror "$@" "unexpectedly exited $status (SEGV)"
else
$out | $EGREP -i "internal error|assertion failed" \
$out | egrep -i "internal error|assertion failed" \
> /dev/null 2>&1
# internal error or assertion failed
if (( $? == 0 )); then
@@ -216,7 +216,7 @@ function log_neg_expect
_printerror "$@" "internal error or assertion failure" \
" exited $status"
elif [[ -n $expect ]] ; then
$out | $GREP -i "$expect" > /dev/null 2>&1
$out | grep -i "$expect" > /dev/null 2>&1
if (( $? == 0 )); then
ret=0
else
@@ -253,13 +253,13 @@ function log_pos
"$@" 2>$logfile
typeset status=$?
out="$CAT $logfile"
out="cat $logfile"
if (( $status != 0 )) ; then
print -u2 $($out)
_printerror "$@" "exited $status"
else
$out | $EGREP -i "internal error|assertion failed" \
$out | egrep -i "internal error|assertion failed" \
> /dev/null 2>&1
# internal error or assertion failed
if [[ $? -eq 0 ]]; then
@@ -452,9 +452,9 @@ function _recursive_output #logfile
while [[ -e $logfile ]]; do
if [[ -z $2 || $logfile != $1 ]]; then
$CAT $logfile
cat $logfile
fi
$RM -f $logfile
rm -f $logfile
logfile="$logfile.$$"
done
}