--- /dev/null
+ADD_TEST(all-non-root-2tape:two-volume-tape "@regressdir@/tests/two-volume-tape")
+ADD_TEST(all-non-root-2tape:incremental-2tape "@regressdir@/tests/incremental-2tape")
+ADD_TEST(all-non-root-tape:ansi-label-1t1d-tape "@regressdir@/tests/ansi-label-1t1d-tape")
+ADD_TEST(all-non-root-tape:backup-bacula-1t1d-tape "@regressdir@/tests/backup-bacula-1t1d-tape")
+ADD_TEST(all-non-root-tape:fixed-block-size-1t1d-tape "@regressdir@/tests/fixed-block-size-1t1d-tape")
+ADD_TEST(all-non-root-tape:four-concurrent-jobs-1t1d-tape "@regressdir@/tests/four-concurrent-jobs-1t1d-tape")
+ADD_TEST(all-non-root-tape:four-jobs-1t1d-tape "@regressdir@/tests/four-jobs-1t1d-tape")
+ADD_TEST(all-non-root-tape:incremental-1t1d-tape "@regressdir@/tests/incremental-1t1d-tape")
+ADD_TEST(all-non-root-tape:relabel-1t1d-tape "@regressdir@/tests/relabel-1t1d-tape")
+ADD_TEST(all-non-root-tape:restore-by-file-1t1d-tape "@regressdir@/tests/restore-by-file-1t1d-tape")
+ADD_TEST(all-non-root-tape:small-file-size-1t1d-tape "@regressdir@/tests/small-file-size-1t1d-tape")
+ADD_TEST(all-non-root-tape:truncate-bug-1t1d-tape "@regressdir@/tests/truncate-bug-1t1d-tape")
+ADD_TEST(all-non-root-tape:two-pool-2t1da-tape "@regressdir@/tests/two-pool-2t1da-tape")
+ADD_TEST(all-non-root-tape:2drive-incremental-2t2da-tape "@regressdir@/tests/2drive-incremental-2t2da-tape")
+ADD_TEST(all-non-root-tape:bscan-1t1d-tape "@regressdir@/tests/bscan-1t1d-tape")
+ADD_TEST(all-non-root-tape:verify-vol-1t1d-tape "@regressdir@/tests/verify-vol-1t1d-tape")
+ADD_TEST(all-non-root:auto-label-test "@regressdir@/tests/auto-label-test")
+ADD_TEST(all-non-root:backup-bacula-test "@regressdir@/tests/backup-bacula-test")
+ADD_TEST(all-non-root:bextract-test "@regressdir@/tests/bextract-test")
+ADD_TEST(all-non-root:big-vol-test "@regressdir@/tests/big-vol-test")
+ADD_TEST(all-non-root:bscan-test "@regressdir@/tests/bscan-test")
+ADD_TEST(all-non-root:bsr-opt-test "@regressdir@/tests/bsr-opt-test")
+ADD_TEST(all-non-root:compressed-test "@regressdir@/tests/compressed-test")
+ADD_TEST(all-non-root:compress-encrypt-test "@regressdir@/tests/compress-encrypt-test")
+ADD_TEST(all-non-root:concurrent-jobs-test "@regressdir@/tests/concurrent-jobs-test")
+ADD_TEST(all-non-root:data-encrypt-test "@regressdir@/tests/data-encrypt-test")
+ADD_TEST(all-non-root:encrypt-bug-test "@regressdir@/tests/encrypt-bug-test")
+ADD_TEST(all-non-root:fifo-test "@regressdir@/tests/fifo-test")
+ADD_TEST(all-non-root:backup-to-null "@regressdir@/tests/backup-to-null")
+ADD_TEST(all-non-root:regexwhere-test "@regressdir@/tests/regexwhere-test")
+ADD_TEST(all-non-root:accurate-test "@regressdir@/tests/accurate-test")
+ADD_TEST(all-non-root:differential-test "@regressdir@/tests/differential-test")
+ADD_TEST(all-non-root:four-concurrent-jobs-test "@regressdir@/tests/four-concurrent-jobs-test")
+ADD_TEST(all-non-root:four-jobs-test "@regressdir@/tests/four-jobs-test")
+ADD_TEST(all-non-root:incremental-test "@regressdir@/tests/incremental-test")
+ADD_TEST(all-non-root:query-test "@regressdir@/tests/query-test")
+ADD_TEST(all-non-root:recycle-test "@regressdir@/tests/recycle-test")
+ADD_TEST(all-non-root:restore2-by-file-test "@regressdir@/tests/restore2-by-file-test")
+ADD_TEST(all-non-root:restore-by-file-test "@regressdir@/tests/restore-by-file-test")
+ADD_TEST(all-non-root:restore-disk-seek-test "@regressdir@/tests/restore-disk-seek-test")
+ADD_TEST(all-non-root:six-vol-test "@regressdir@/tests/six-vol-test")
+ADD_TEST(all-non-root:span-vol-test "@regressdir@/tests/span-vol-test")
+ADD_TEST(all-non-root:maxvol-test "@regressdir@/tests/maxvol-test")
+ADD_TEST(all-non-root:maxvol2-test "@regressdir@/tests/maxvol2-test")
+ADD_TEST(all-non-root:sparse-compressed-test "@regressdir@/tests/sparse-compressed-test")
+ADD_TEST(all-non-root:sparse-test "@regressdir@/tests/sparse-test")
+ADD_TEST(all-non-root:two-jobs-test "@regressdir@/tests/two-jobs-test")
+ADD_TEST(all-non-root:two-vol-test "@regressdir@/tests/two-vol-test")
+ADD_TEST(all-non-root:verify-cat-test "@regressdir@/tests/verify-cat-test")
+ADD_TEST(all-non-root:verify-vol-test "@regressdir@/tests/verify-vol-test")
+ADD_TEST(all-non-root:weird-files2-test "@regressdir@/tests/weird-files2-test")
+ADD_TEST(all-non-root:weird-files-test "@regressdir@/tests/weird-files-test")
+ADD_TEST(all-non-root:migration-job-test "@regressdir@/tests/migration-job-test")
+ADD_TEST(all-non-root:migration-jobspan-test "@regressdir@/tests/migration-jobspan-test")
+ADD_TEST(all-non-root:migration-volume-test "@regressdir@/tests/migration-volume-test")
+ADD_TEST(all-non-root:migration-time-test "@regressdir@/tests/migration-time-test")
+ADD_TEST(all-non-root:hardlink-test "@regressdir@/tests/hardlink-test")
+ADD_TEST(all-non-root:tls-test "@regressdir@/tests/tls-test")
+ADD_TEST(all-non-root:two-pool-test "@regressdir@/tests/two-pool-test")
+ADD_TEST(all-non-root:fast-two-pool-test "@regressdir@/tests/fast-two-pool-test")
+ADD_TEST(all-non-root:two-volume-test "@regressdir@/tests/two-volume-test")
+ADD_TEST(all-non-root:incremental-2disk "@regressdir@/tests/incremental-2disk")
+ADD_TEST(all-non-root:2drive-incremental-2disk "@regressdir@/tests/2drive-incremental-2disk")
+ADD_TEST(all-non-root:scratch-pool-test "@regressdir@/tests/scratch-pool-test")
+ADD_TEST(all-non-root:2drive-concurrent-test "@regressdir@/tests/2drive-concurrent-test")
+ADD_TEST(all-non-root:incremental-2media "@regressdir@/tests/incremental-2media")
+ADD_TEST(all-non-root:three-pool-test "@regressdir@/tests/three-pool-test")
+ADD_TEST(all-non-root:2drive-3pool-test "@regressdir@/tests/2drive-3pool-test")
+ADD_TEST(all-root:dev-test-root "@regressdir@/tests/dev-test-root")
+ADD_TEST(all-root:etc-test-root "@regressdir@/tests/etc-test-root")
+ADD_TEST(all-root:lib-test-root "@regressdir@/tests/lib-test-root")
+ADD_TEST(all-root:usr-tape-root "@regressdir@/tests/usr-tape-root")
+ADD_TEST(all-non-root-2tape:two-volume-tape "@regressdir@/tests/two-volume-tape")
+ADD_TEST(all-non-root-2tape:incremental-2tape "@regressdir@/tests/incremental-2tape")
+ADD_TEST(all-non-root-tape:ansi-label-1t1d-tape "@regressdir@/tests/ansi-label-1t1d-tape")
+ADD_TEST(all-non-root-tape:backup-bacula-1t1d-tape "@regressdir@/tests/backup-bacula-1t1d-tape")
+ADD_TEST(all-non-root-tape:fixed-block-size-1t1d-tape "@regressdir@/tests/fixed-block-size-1t1d-tape")
+ADD_TEST(all-non-root-tape:four-concurrent-jobs-1t1d-tape "@regressdir@/tests/four-concurrent-jobs-1t1d-tape")
+ADD_TEST(all-non-root-tape:four-jobs-1t1d-tape "@regressdir@/tests/four-jobs-1t1d-tape")
+ADD_TEST(all-non-root-tape:incremental-1t1d-tape "@regressdir@/tests/incremental-1t1d-tape")
+ADD_TEST(all-non-root-tape:relabel-1t1d-tape "@regressdir@/tests/relabel-1t1d-tape")
+ADD_TEST(all-non-root-tape:restore-by-file-1t1d-tape "@regressdir@/tests/restore-by-file-1t1d-tape")
+ADD_TEST(all-non-root-tape:small-file-size-1t1d-tape "@regressdir@/tests/small-file-size-1t1d-tape")
+ADD_TEST(all-non-root-tape:truncate-bug-1t1d-tape "@regressdir@/tests/truncate-bug-1t1d-tape")
+ADD_TEST(all-non-root-tape:two-pool-2t1da-tape "@regressdir@/tests/two-pool-2t1da-tape")
+ADD_TEST(all-non-root-tape:2drive-incremental-2t2da-tape "@regressdir@/tests/2drive-incremental-2t2da-tape")
+ADD_TEST(all-non-root-tape:bscan-1t1d-tape "@regressdir@/tests/bscan-1t1d-tape")
+ADD_TEST(all-non-root-tape:verify-vol-1t1d-tape "@regressdir@/tests/verify-vol-1t1d-tape")
+ADD_TEST(all-non-root:auto-label-test "@regressdir@/tests/auto-label-test")
+ADD_TEST(all-non-root:backup-bacula-test "@regressdir@/tests/backup-bacula-test")
+ADD_TEST(all-non-root:bextract-test "@regressdir@/tests/bextract-test")
+ADD_TEST(all-non-root:big-vol-test "@regressdir@/tests/big-vol-test")
+ADD_TEST(all-non-root:bscan-test "@regressdir@/tests/bscan-test")
+ADD_TEST(all-non-root:bsr-opt-test "@regressdir@/tests/bsr-opt-test")
+ADD_TEST(all-non-root:compressed-test "@regressdir@/tests/compressed-test")
+ADD_TEST(all-non-root:compress-encrypt-test "@regressdir@/tests/compress-encrypt-test")
+ADD_TEST(all-non-root:concurrent-jobs-test "@regressdir@/tests/concurrent-jobs-test")
+ADD_TEST(all-non-root:data-encrypt-test "@regressdir@/tests/data-encrypt-test")
+ADD_TEST(all-non-root:encrypt-bug-test "@regressdir@/tests/encrypt-bug-test")
+ADD_TEST(all-non-root:fifo-test "@regressdir@/tests/fifo-test")
+ADD_TEST(all-non-root:backup-to-null "@regressdir@/tests/backup-to-null")
+ADD_TEST(all-non-root:regexwhere-test "@regressdir@/tests/regexwhere-test")
+ADD_TEST(all-non-root:differential-test "@regressdir@/tests/differential-test")
+ADD_TEST(all-non-root:four-concurrent-jobs-test "@regressdir@/tests/four-concurrent-jobs-test")
+ADD_TEST(all-non-root:four-jobs-test "@regressdir@/tests/four-jobs-test")
+ADD_TEST(all-non-root:incremental-test "@regressdir@/tests/incremental-test")
+ADD_TEST(all-non-root:query-test "@regressdir@/tests/query-test")
+ADD_TEST(all-non-root:recycle-test "@regressdir@/tests/recycle-test")
+ADD_TEST(all-non-root:restore2-by-file-test "@regressdir@/tests/restore2-by-file-test")
+ADD_TEST(all-non-root:restore-by-file-test "@regressdir@/tests/restore-by-file-test")
+ADD_TEST(all-non-root:restore-disk-seek-test "@regressdir@/tests/restore-disk-seek-test")
+ADD_TEST(all-non-root:six-vol-test "@regressdir@/tests/six-vol-test")
+ADD_TEST(all-non-root:span-vol-test "@regressdir@/tests/span-vol-test")
+ADD_TEST(all-non-root:maxvol-test "@regressdir@/tests/maxvol-test")
+ADD_TEST(all-non-root:maxvol2-test "@regressdir@/tests/maxvol2-test")
+ADD_TEST(all-non-root:sparse-compressed-test "@regressdir@/tests/sparse-compressed-test")
+ADD_TEST(all-non-root:sparse-test "@regressdir@/tests/sparse-test")
+ADD_TEST(all-non-root:two-jobs-test "@regressdir@/tests/two-jobs-test")
+ADD_TEST(all-non-root:two-vol-test "@regressdir@/tests/two-vol-test")
+ADD_TEST(all-non-root:verify-cat-test "@regressdir@/tests/verify-cat-test")
+ADD_TEST(all-non-root:verify-vol-test "@regressdir@/tests/verify-vol-test")
+ADD_TEST(all-non-root:weird-files2-test "@regressdir@/tests/weird-files2-test")
+ADD_TEST(all-non-root:weird-files-test "@regressdir@/tests/weird-files-test")
+ADD_TEST(all-non-root:migration-job-test "@regressdir@/tests/migration-job-test")
+ADD_TEST(all-non-root:migration-jobspan-test "@regressdir@/tests/migration-jobspan-test")
+ADD_TEST(all-non-root:migration-volume-test "@regressdir@/tests/migration-volume-test")
+ADD_TEST(all-non-root:migration-time-test "@regressdir@/tests/migration-time-test")
+ADD_TEST(all-non-root:hardlink-test "@regressdir@/tests/hardlink-test")
+ADD_TEST(all-non-root:tls-test "@regressdir@/tests/tls-test")
+ADD_TEST(all-non-root:two-pool-test "@regressdir@/tests/two-pool-test")
+ADD_TEST(all-non-root:fast-two-pool-test "@regressdir@/tests/fast-two-pool-test")
+ADD_TEST(all-non-root:two-volume-test "@regressdir@/tests/two-volume-test")
+ADD_TEST(all-non-root:incremental-2disk "@regressdir@/tests/incremental-2disk")
+ADD_TEST(all-non-root:2drive-incremental-2disk "@regressdir@/tests/2drive-incremental-2disk")
+ADD_TEST(all-non-root:scratch-pool-test "@regressdir@/tests/scratch-pool-test")
+ADD_TEST(all-non-root:2drive-concurrent-test "@regressdir@/tests/2drive-concurrent-test")
+ADD_TEST(all-non-root:incremental-2media "@regressdir@/tests/incremental-2media")
+ADD_TEST(all-non-root:three-pool-test "@regressdir@/tests/three-pool-test")
+ADD_TEST(all-non-root:2drive-3pool-test "@regressdir@/tests/2drive-3pool-test")
+ADD_TEST(all-root:dev-test-root "@regressdir@/tests/dev-test-root")
+ADD_TEST(all-root:etc-test-root "@regressdir@/tests/etc-test-root")
+ADD_TEST(all-root:lib-test-root "@regressdir@/tests/lib-test-root")
+ADD_TEST(all-root:usr-tape-root "@regressdir@/tests/usr-tape-root")
echo " " >>test.out
echo "Start non-root disk tests"
echo "Start non-root disk tests" >>test.out
-nice tests/auto-label-test
-nice tests/backup-bacula-test
-nice tests/bextract-test
-nice tests/big-vol-test
-nice tests/bscan-test
-nice tests/bsr-opt-test
-nice tests/compressed-test
-nice tests/compress-encrypt-test
-nice tests/concurrent-jobs-test
-nice tests/data-encrypt-test
-nice tests/encrypt-bug-test
-nice tests/fifo-test
-nice tests/backup-to-null
-nice tests/regexwhere-test
-nice tests/accurate-test
-# The following two can uses *lots* of disk space
-# so they are normally turned off, but if you have
-# at least two GB free, you can run them
-#nice tests/sparse-encrypt-test
-#nice tests/gigaslam-sparse-test
-nice tests/differential-test
-nice tests/four-concurrent-jobs-test
-nice tests/four-jobs-test
-nice tests/incremental-test
-nice tests/query-test
-nice tests/recycle-test
-nice tests/restore2-by-file-test
-nice tests/restore-by-file-test
-nice tests/restore-disk-seek-test
-#nice tests/runscript-test
-nice tests/six-vol-test
-nice tests/span-vol-test
-nice tests/maxvol-test
-nice tests/maxvol2-test
-nice tests/sparse-compressed-test
-nice tests/sparse-test
-nice tests/two-jobs-test
-nice tests/two-vol-test
-nice tests/verify-cat-test
-nice tests/verify-vol-test
-nice tests/weird-files2-test
-nice tests/weird-files-test
-nice tests/migration-job-test
-nice tests/migration-jobspan-test
-nice tests/migration-volume-test
-nice tests/migration-time-test
-nice tests/hardlink-test
-nice tests/tls-test
+ctest -R all-non-root:
echo "End non-root disk tests"
echo "End non-root disk tests" >>test.out
-
-#
-# The following are Virtual Disk Autochanger tests
-echo " "
-echo " " >>test.out
-echo "Start non-root virtual disk autochanger tests"
-echo "Start non-root virtual disk autochanger tests" >>test.out
-#nice tests/three-pool-recycle-test
-nice tests/two-pool-test
-nice tests/fast-two-pool-test
-nice tests/two-volume-test
-nice tests/incremental-2disk
-nice tests/2drive-incremental-2disk
-nice tests/scratch-pool-test
-nice tests/2drive-concurrent-test
-nice tests/incremental-2media
-nice tests/three-pool-test
-nice tests/2drive-3pool-test
-echo "End non-root virtual disk autochanger tests"
-echo "End non-root virtual disk autochanger tests" >>test.out