diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-12-09 17:06:37 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-12-09 17:06:37 -0500 |
| commit | 3e18cbafcf6beaf051f34ea17a61604b7fb124fa (patch) | |
| tree | 6d64de4a1052ede5c615878c891de02fda59cd62 /usr/src/test | |
| parent | 0199755ac9b09f39761575c6ad49c509965f244d (diff) | |
| parent | 8b4261085e0d677be9a3253ff6b4c290e402576d (diff) | |
| download | illumos-joyent-3e18cbafcf6beaf051f34ea17a61604b7fb124fa.tar.gz | |
[illumos-gate merge]
commit 8b4261085e0d677be9a3253ff6b4c290e402576d
15244 zfs-tests: zfstest should accept multiple -c options
commit 9e3aeadeb229d472ee0ae8425dc913dfe7e81ea2
15238 prom_reboot/panic should be machdep
commit 4e320a8a375380e6f3963134cd6c1001e2bdb7fa
15245 zfs_clone_010_pos: fix python statement
commit 46593baa8941a05e8871baac4528bcfbf249570c
15243 test-runner: tell us when there was no tests to run
Diffstat (limited to 'usr/src/test')
| -rw-r--r-- | usr/src/test/test-runner/cmd/run | 1 | ||||
| -rw-r--r-- | usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh | 9 | ||||
| -rw-r--r-- | usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/test/test-runner/cmd/run b/usr/src/test/test-runner/cmd/run index 658940c3b9..189be04d4d 100644 --- a/usr/src/test/test-runner/cmd/run +++ b/usr/src/test/test-runner/cmd/run @@ -869,6 +869,7 @@ class TestRun(object): def summary(self): if Result.total == 0: + print('No tests to run') return print('\nResults Summary') diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh index 40932e82a2..527c89163f 100644 --- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh +++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh @@ -156,8 +156,13 @@ while getopts ac:l:qT: c; do auto_detect=true ;; 'c') - runfiles=$OPTARG - [[ -f $runfiles ]] || fail "Cannot read file: $runfiles" + runfile=$OPTARG + [[ -f $runfile ]] || fail "Cannot read file: $runfile" + if [[ -z $runfiles ]]; then + runfiles=$runfile + else + runfiles+=",$runfile" + fi ;; 'l') logfile=$OPTARG diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh index cd471999e0..cd364bb957 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh @@ -220,7 +220,7 @@ fs=$TESTPOOL/$TESTFS1 log_must zfs create $fs log_must zfs snapshot $fs@snap while((i < 7)); do - log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i + log_must zfs clone $fs@snap $fs/$TESTCLONE$(printf %0.sx {1..200}).$i ((i=i+1)) ((j=j+200)) done |