#pre =
#post =
-# DISABLED:
-# history_001_pos - export commands missing from history
-# history_003_pos - nested pool
-# history_006_neg - needs investigation
-# history_007_pos - needs investigation
-# history_008_pos - needs investigation
-# history_010_pos - needs investigation
[tests/functional/history]
-tests = ['history_002_pos', 'history_004_pos', 'history_005_neg',
- 'history_009_pos']
+tests = ['history_001_pos', 'history_002_pos', 'history_003_pos',
+ 'history_004_pos', 'history_005_neg', 'history_006_neg',
+ 'history_007_pos', 'history_008_pos', 'history_009_pos',
+ 'history_010_pos']
[tests/functional/inheritance]
tests = ['inherit_001_pos']
history_007_pos.ksh \
history_008_pos.ksh \
history_009_pos.ksh \
- history_010_pos.ksh
-
-
-EXTRA_DIST = \
+ history_010_pos.ksh \
i386.migratedpool.DAT.Z \
i386.orig_history.txt \
sparc.migratedpool.DAT.Z \
$ZPOOL history $MPOOL > $TMP_HISTORY 2>/dev/null
$DIFF $OLD_HISTORY $TMP_HISTORY | $GREP "^> " | $SED 's/^> //g' > \
$NEW_HISTORY
- $GREP "$($ECHO "$cmd1" | $SED 's/\/usr\/sbin\///g')" $NEW_HISTORY \
- >/dev/null 2>&1 || log_fail "Didn't find \"$cmd1\" in pool history"
- $GREP "$($ECHO "$cmd2" | $SED 's/\/usr\/sbin\///g')" $NEW_HISTORY \
- >/dev/null 2>&1 || log_fail "Didn't find \"$cmd2\" in pool history"
+ if is_linux; then
+ $GREP "$($ECHO "$cmd1" | $SED 's/^.*\/\(zpool .*\).*$/\1/')" \
+ $NEW_HISTORY >/dev/null 2>&1 || \
+ log_fail "Didn't find \"$cmd1\" in pool history"
+ $GREP "$($ECHO "$cmd2" | $SED 's/^.*\/\(zpool .*\).*$/\1/')" \
+ $NEW_HISTORY >/dev/null 2>&1 || \
+ log_fail "Didn't find \"$cmd2\" in pool history"
+ else
+ $GREP "$($ECHO "$cmd1" | $SED 's/\/usr\/sbin\///g')" \
+ $NEW_HISTORY >/dev/null 2>&1 || \
+ log_fail "Didn't find \"$cmd1\" in pool history"
+ $GREP "$($ECHO "$cmd2" | $SED 's/\/usr\/sbin\///g')" \
+ $NEW_HISTORY >/dev/null 2>&1 || \
+ log_fail "Didn't find \"$cmd2\" in pool history"
+ fi
done
run_and_verify -p "$MPOOL" "$ZPOOL split $MPOOL ${MPOOL}_split"
hname=$hname:$($ZONENAME)
fi
- $GREP "$cmd \[user $uid ($user) on $hname\]" $NEW_HISTORY >/dev/null \
- 2>&1
+ typeset suffix=""
+ if [ is_linux ]; then
+ suffix=":linux"
+ fi
+
+ $GREP "$cmd \[user $uid ($user) on $hname$suffix\]" \
+ $NEW_HISTORY >/dev/null 2>&1
if [[ $? != 0 ]]; then
log_note "Couldn't find long information for \"$cmd\""
return 1