diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-21 11:53:46 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-21 11:53:46 +0000 |
| commit | 20b67019efdd4dfa910ee550b78517b17e85db06 (patch) | |
| tree | e5912449320a5b76069106318c72f50555bc1837 /usr/src | |
| parent | 711f1be0f481858358ac05e6d30ed7003e9d9394 (diff) | |
| parent | 92b33eab9463d6c4878cfe65febf2ff232689649 (diff) | |
| download | illumos-joyent-20b67019efdd4dfa910ee550b78517b17e85db06.tar.gz | |
[illumos-gate merge]
commit 92b33eab9463d6c4878cfe65febf2ff232689649
7194 Reservation tests do not properly calculate reservation size
7195 Increase the default timeout for individual tests in zfstest
Diffstat (limited to 'usr/src')
4 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/test/zfs-tests/runfiles/delphix.run b/usr/src/test/zfs-tests/runfiles/delphix.run index 3b42bc01ef..1fdd593eae 100644 --- a/usr/src/test/zfs-tests/runfiles/delphix.run +++ b/usr/src/test/zfs-tests/runfiles/delphix.run @@ -10,7 +10,7 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # @@ -19,7 +19,7 @@ pre = setup quiet = False pre_user = root user = root -timeout = 600 +timeout = 1800 post_user = root post = cleanup outputdir = /var/tmp/test_results diff --git a/usr/src/test/zfs-tests/runfiles/omnios.run b/usr/src/test/zfs-tests/runfiles/omnios.run index 8135752158..a1cef540c5 100644 --- a/usr/src/test/zfs-tests/runfiles/omnios.run +++ b/usr/src/test/zfs-tests/runfiles/omnios.run @@ -10,7 +10,7 @@ # # -# Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # @@ -19,7 +19,7 @@ pre = setup quiet = False pre_user = root user = root -timeout = 600 +timeout = 1800 post_user = root post = cleanup outputdir = /var/tmp/test_results diff --git a/usr/src/test/zfs-tests/runfiles/openindiana.run b/usr/src/test/zfs-tests/runfiles/openindiana.run index 2577a4e020..f8f6af23a7 100644 --- a/usr/src/test/zfs-tests/runfiles/openindiana.run +++ b/usr/src/test/zfs-tests/runfiles/openindiana.run @@ -10,7 +10,7 @@ # # -# Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # @@ -19,7 +19,7 @@ pre = setup quiet = False pre_user = root user = root -timeout = 600 +timeout = 1800 post_user = root post = cleanup outputdir = /var/tmp/test_results diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib b/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib index e58e198152..d0a9b384ec 100644 --- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib +++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib @@ -25,7 +25,7 @@ # # -# Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright (c) 2013, 2016 by Delphix. All rights reserved. # . $STF_SUITE/tests/functional/reservation/reservation.cfg @@ -144,7 +144,7 @@ function volsize_to_reservation typeset vol=$1 typeset -i volsize=$2 - typeset -i DN_MAX_INDBLKSHIFT=14 + typeset -i DN_MAX_INDBLKSHIFT=17 typeset -i SPA_BLKPTRSHIFT=7 typeset -i SPA_DVAS_PER_BP=3 |