Skip to content
Permalink
Browse files

4206 history_003_pos relies on exact size of history log and entries

4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
  • Loading branch information...
jwk404 authored and Christopher Siden committed Dec 10, 2013
1 parent 43466aa commit f38cb554a534c6df738be3f4d23327e69888e634
Showing 603 changed files with 45,296 additions and 63 deletions.
@@ -334,6 +334,8 @@ usr/src/lib/krb5/ss/std_rqs.c
usr/src/lib/krb5/ss/utils.c
usr/src/lib/librstp/common/*.[ch]
usr/src/lib/librstp/common/[CRT]*
usr/src/test/zfs-tests/tests/functional/history/*Z
usr/src/test/zfs-tests/tests/functional/history/*txt
usr/src/uts/intel/nsmb/ioc_check.ref
usr/src/uts/intel/os/splashimage.xpm
usr/src/uts/common/gssapi/mechs/krb5/crypto/block_size.c
@@ -20,6 +20,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
# Copyright (c) 2013 by Delphix. All rights reserved.
#

syntax: glob
@@ -32,4 +33,5 @@ usr/src/cmd/terminfo/termcap.src
usr/src/cmd/terminfo/terminfo.src
usr/src/cmd/zonestat/zonestat/zonestat.c
usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
usr/src/test/test-runner/cmd/run.py
@@ -21,7 +21,7 @@

/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright 2012 Milan Jurik. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2013 Steven Hartland. All rights reserved.
@@ -2137,7 +2137,7 @@ static int us_type_bits[] = {
USTYPE_SMB_USR,
USTYPE_ALL
};
static char *us_type_names[] = { "posixgroup", "posxiuser", "smbgroup",
static char *us_type_names[] = { "posixgroup", "posixuser", "smbgroup",
"smbuser", "all" };

typedef struct us_node {

Large diffs are not rendered by default.

@@ -12,7 +12,7 @@
#

#
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2013 by Delphix. All rights reserved.
#

import ConfigParser
@@ -234,7 +234,8 @@ def log(self, logger, options):
if logger is None:
return

user = ' (run as %s)' % self.user if len(self.user) else ''
logname = getpwuid(os.getuid()).pw_name
user = ' (run as %s)' % (self.user if len(self.user) else logname)
msga = 'Test: %s%s ' % (self.pathname, user)
msgb = '[%s] [%s]' % (self.result.runtime, self.result.result)
pad = ' ' * (80 - (len(msga) + len(msgb)))
@@ -10,7 +10,7 @@
#

#
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2013 by Delphix. All rights reserved.
#

export ARP="/usr/sbin/arp"
@@ -141,6 +141,7 @@ export UFSDUMP="/usr/sbin/ufsdump"
export UFSRESTORE="/usr/sbin/ufsrestore"
export UMASK="/usr/bin/umask"
export UMOUNT="/usr/sbin/umount"
export UMOUNTALL="/usr/sbin/umountall"
export UNAME="/usr/bin/uname"
export UNCOMPRESS="/usr/bin/uncompress"
export UNIQ="/usr/bin/uniq"
@@ -25,7 +25,7 @@
#

#
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2013 by Delphix. All rights reserved.
#

. ${STF_TOOLS}/contrib/include/logapi.shlib
@@ -2569,3 +2569,19 @@ function is_te_enabled
return 0
fi
}

# Utility function to determine if a system has multiple cpus.
function is_mp
{
(($(psrinfo -p) > 1))
}

# Run the given command as the user provided.
function user_run
{
typeset user=$1
shift

eval \$SU \$user -c \"$@\" > /tmp/out 2>/tmp/err
return $?
}

0 comments on commit f38cb55

Please sign in to comment.
You can’t perform that action at this time.