rump: turn MKRUMP into a no-op

distrib/sets/lists/tests/mi

@@ -1340,11 +1340,11 @@
 ./usr/tests/dev/Atffile				tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/Kyuafile			tests-fs-tests		compattestfile,atf,kyua
 ./usr/tests/dev/audio				tests-fs-tests		compattestfile,atf
-./usr/tests/dev/audio/Atffile			tests-fs-tests		atf,rump
+#./usr/tests/dev/audio/Atffile			tests-fs-tests		atf,rump
-./usr/tests/dev/audio/Kyuafile			tests-fs-tests		atf,rump,kyua
+#./usr/tests/dev/audio/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/dev/audio/h_pad			tests-fs-tests		atf,rump
+#./usr/tests/dev/audio/h_pad			tests-fs-tests		atf,rump
-./usr/tests/dev/audio/t_pad			tests-fs-tests		atf,rump
+#./usr/tests/dev/audio/t_pad			tests-fs-tests		atf,rump
-./usr/tests/dev/audio/t_pad_output.bz2.uue	tests-fs-tests		atf,rump
+#./usr/tests/dev/audio/t_pad_output.bz2.uue	tests-fs-tests		atf,rump
 ./usr/tests/dev/cgd				tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/cgd/Atffile			tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/cgd/Kyuafile			tests-fs-tests		compattestfile,atf,kyua
@@ -1354,171 +1354,171 @@
 ./usr/tests/dev/cgd/paramsfile			tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/cgd/t_cgd			tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/md				tests-fs-tests		compattestfile,atf
-./usr/tests/dev/md/Atffile			tests-fs-tests		atf,rump
+#./usr/tests/dev/md/Atffile			tests-fs-tests		atf,rump
-./usr/tests/dev/md/Kyuafile			tests-fs-tests		atf,rump,kyua
+#./usr/tests/dev/md/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/dev/md/h_mdserv			tests-fs-tests		atf,rump
+#./usr/tests/dev/md/h_mdserv			tests-fs-tests		atf,rump
-./usr/tests/dev/md/t_md				tests-fs-tests		atf,rump
+#./usr/tests/dev/md/t_md				tests-fs-tests		atf,rump
 ./usr/tests/dev/raidframe			tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/raidframe/Atffile		tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/raidframe/Kyuafile		tests-fs-tests		compattestfile,atf,kyua
 ./usr/tests/dev/raidframe/t_raid		tests-fs-tests		compattestfile,atf
 ./usr/tests/dev/scsipi				tests-fs-tests		compattestfile,atf
-./usr/tests/dev/scsipi/Atffile			tests-fs-tests		atf,rump
+#./usr/tests/dev/scsipi/Atffile			tests-fs-tests		atf,rump
-./usr/tests/dev/scsipi/Kyuafile			tests-fs-tests		atf,rump,kyua
+#./usr/tests/dev/scsipi/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/dev/scsipi/t_cd			tests-fs-tests		atf,rump
+#./usr/tests/dev/scsipi/t_cd			tests-fs-tests		atf,rump
 ./usr/tests/dev/sysmon				tests-fs-tests		compattestfile,atf
-./usr/tests/dev/sysmon/Atffile			tests-fs-tests		atf,rump
+#./usr/tests/dev/sysmon/Atffile			tests-fs-tests		atf,rump
-./usr/tests/dev/sysmon/Kyuafile			tests-fs-tests		atf,rump,kyua
+#./usr/tests/dev/sysmon/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/dev/sysmon/t_swsensor		tests-fs-tests		atf,rump
+#./usr/tests/dev/sysmon/t_swsensor		tests-fs-tests		atf,rump
-./usr/tests/dev/sysmon/t_swwdog			tests-fs-tests		atf,rump
+#./usr/tests/dev/sysmon/t_swwdog			tests-fs-tests		atf,rump
 ./usr/tests/examples				tests-obsolete		obsolete
 ./usr/tests/examples/Atffile			tests-obsolete		obsolete
 ./usr/tests/examples/t_asm			tests-obsolete		obsolete
 ./usr/tests/fs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/Kyuafile				tests-fs-tests		atf,rump,kyua
 ./usr/tests/fs/cd9660				tests-fs-tests		compattestfile,atf
-./usr/tests/fs/cd9660/Atffile			tests-fs-tests		atf,rump
+#./usr/tests/fs/cd9660/Atffile			tests-fs-tests		atf,rump
-./usr/tests/fs/cd9660/Kyuafile			tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/cd9660/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/cd9660/pr_48787.image.bz2	tests-fs-tests		atf,rump
+#./usr/tests/fs/cd9660/pr_48787.image.bz2	tests-fs-tests		atf,rump
-./usr/tests/fs/cd9660/t_high_ino_big_file	tests-fs-tests		atf,rump
+#./usr/tests/fs/cd9660/t_high_ino_big_file	tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs				tests-fs-tests		compattestfile,atf
-./usr/tests/fs/ffs/Atffile			tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/Atffile			tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/Kyuafile			tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/ffs/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/ffs/h_ffs_server			tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/h_ffs_server			tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs/h_quota2_server			tests-obsolete		obsolete
-./usr/tests/fs/ffs/h_quota2_tests			tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/h_quota2_tests			tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs/rump_edquota				tests-obsolete		obsolete
 ./usr/tests/fs/ffs/rump_quota				tests-obsolete		obsolete
 ./usr/tests/fs/ffs/rump_quotactl			tests-obsolete		obsolete
 ./usr/tests/fs/ffs/rump_repquota			tests-obsolete		obsolete
-./usr/tests/fs/ffs/t_clearquota				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_clearquota				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_fifos				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_fifos				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_getquota				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_getquota				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_miscquota				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_miscquota				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_mount				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_mount				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_quota2_1				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_quota2_1				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_quota2_remount			tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_quota2_remount			tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_quotalimit				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_quotalimit				tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs/t_renamerace				tests-obsolete		obsolete
-./usr/tests/fs/ffs/t_setquota				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_setquota				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_snapshot				tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_snapshot				tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_snapshot_log			tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_snapshot_log			tests-fs-tests		atf,rump
-./usr/tests/fs/ffs/t_snapshot_v2			tests-fs-tests		atf,rump
+#./usr/tests/fs/ffs/t_snapshot_v2			tests-fs-tests		atf,rump
 ./usr/tests/fs/fifofs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/fifofs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/fifofs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/fifofs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/fifofs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/fifofs/t_fifo				tests-fs-tests		atf,rump
+#./usr/tests/fs/fifofs/t_fifo				tests-fs-tests		atf,rump
-./usr/tests/fs/h_funcs.subr				tests-fs-tests		atf,rump
+#./usr/tests/fs/h_funcs.subr				tests-fs-tests		atf,rump
 ./usr/tests/fs/hfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/hfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/hfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/hfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/hfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/hfs/colon.hfs.bz2.uue			tests-fs-tests		atf,rump
+#./usr/tests/fs/hfs/colon.hfs.bz2.uue			tests-fs-tests		atf,rump
-./usr/tests/fs/hfs/t_pathconvert			tests-fs-tests		atf,rump
+#./usr/tests/fs/hfs/t_pathconvert			tests-fs-tests		atf,rump
 ./usr/tests/fs/kernfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/kernfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/kernfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/kernfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/kernfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/kernfs/t_basic				tests-fs-tests		atf,rump
+#./usr/tests/fs/kernfs/t_basic				tests-fs-tests		atf,rump
 ./usr/tests/fs/lfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/lfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/lfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/lfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/lfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/lfs/t_pr					tests-fs-tests		atf,rump
+#./usr/tests/fs/lfs/t_pr					tests-fs-tests		atf,rump
 ./usr/tests/fs/msdosfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/msdosfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/msdosfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/msdosfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/msdosfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/msdosfs/t_snapshot			tests-fs-tests		atf,rump
+#./usr/tests/fs/msdosfs/t_snapshot			tests-fs-tests		atf,rump
 ./usr/tests/fs/nfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/nfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/nfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/nfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/nfs/Kyuafile				tests-fs-tests		atf,rump,kyua
 ./usr/tests/fs/nfs/nfsservice				tests-fs-tests		compattestfile,atf
-./usr/tests/fs/nfs/nfsservice/exports			tests-fs-tests		atf,rump
+#./usr/tests/fs/nfs/nfsservice/exports			tests-fs-tests		atf,rump
-./usr/tests/fs/nfs/nfsservice/rumpnfsd			tests-fs-tests		atf,rump
+#./usr/tests/fs/nfs/nfsservice/rumpnfsd			tests-fs-tests		atf,rump
-./usr/tests/fs/nfs/t_mountd				tests-fs-tests		atf,rump
+#./usr/tests/fs/nfs/t_mountd				tests-fs-tests		atf,rump
-./usr/tests/fs/nfs/t_rquotad				tests-fs-tests		atf,rump
+#./usr/tests/fs/nfs/t_rquotad				tests-fs-tests		atf,rump
 ./usr/tests/fs/nullfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/nullfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/nullfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/nullfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/nullfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/nullfs/t_basic				tests-fs-tests		atf,rump
+#./usr/tests/fs/nullfs/t_basic				tests-fs-tests		atf,rump
 ./usr/tests/fs/psshfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/psshfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/psshfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/psshfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/psshfs/h_have_puffs			tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/h_have_puffs			tests-fs-tests		atf,rump
-./usr/tests/fs/psshfs/ssh_config.in			tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/ssh_config.in			tests-fs-tests		atf,rump
-./usr/tests/fs/psshfs/ssh_host_key			tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/ssh_host_key			tests-fs-tests		atf,rump
-./usr/tests/fs/psshfs/ssh_host_key.pub			tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/ssh_host_key.pub			tests-fs-tests		atf,rump
-./usr/tests/fs/psshfs/sshd_config.in			tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/sshd_config.in			tests-fs-tests		atf,rump
-./usr/tests/fs/psshfs/t_psshfs				tests-fs-tests		atf,rump
+#./usr/tests/fs/psshfs/t_psshfs				tests-fs-tests		atf,rump
 ./usr/tests/fs/ptyfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/ptyfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/ptyfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/ptyfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/ptyfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/ptyfs/t_nullpts				tests-fs-tests		atf,rump
+#./usr/tests/fs/ptyfs/t_nullpts				tests-fs-tests		atf,rump
-./usr/tests/fs/ptyfs/t_ptyfs				tests-fs-tests		atf,rump
+#./usr/tests/fs/ptyfs/t_ptyfs				tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/puffs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/puffs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/puffs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/puffs/Kyuafile				tests-fs-tests		atf,rump,kyua
 ./usr/tests/fs/puffs/h_dtfs				tests-fs-tests		compattestfile,atf
-./usr/tests/fs/puffs/h_dtfs/h_dtfs			tests-fs-tests		atf,rump
+#./usr/tests/fs/puffs/h_dtfs/h_dtfs			tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs/h_have_puffs			tests-obsolete		obsolete
 ./usr/tests/fs/puffs/ssh_config.in			tests-obsolete		obsolete
 ./usr/tests/fs/puffs/ssh_host_key			tests-obsolete		obsolete
 ./usr/tests/fs/puffs/ssh_host_key.pub			tests-obsolete		obsolete
 ./usr/tests/fs/puffs/sshd_config.in			tests-obsolete		obsolete
-./usr/tests/fs/puffs/t_basic				tests-fs-tests		atf,rump
+#./usr/tests/fs/puffs/t_basic				tests-fs-tests		atf,rump
-./usr/tests/fs/puffs/t_fuzz				tests-fs-tests		atf,rump
+#./usr/tests/fs/puffs/t_fuzz				tests-fs-tests		atf,rump
-./usr/tests/fs/puffs/t_io				tests-fs-tests		atf,rump
+#./usr/tests/fs/puffs/t_io				tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs/t_psshfs				tests-obsolete		obsolete
 ./usr/tests/fs/tmpfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/tmpfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/tmpfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/tmpfs/h_funcs.subr			tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/h_funcs.subr			tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/h_tools				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/h_tools				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_create				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_create				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_devices				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_devices				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_dots				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_dots				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_exec				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_exec				tests-fs-tests		atf,rump
 ./usr/tests/fs/tmpfs/t_id_gen				tests-obsolete		obsolete
-./usr/tests/fs/tmpfs/t_link				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_link				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_mkdir				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_mkdir				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_mknod				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_mknod				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_mount				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_mount				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_pipes				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_pipes				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_read_write			tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_read_write			tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_readdir				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_readdir				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_remove				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_remove				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_rename				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_rename				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_renamerace			tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_renamerace			tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_rmdir				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_rmdir				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_setattr				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_setattr				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_sizes				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_sizes				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_sockets				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_sockets				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_statvfs				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_statvfs				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_symlink				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_symlink				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_times				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_times				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_trail_slash			tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_trail_slash			tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_truncate				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_truncate				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_vnd				tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_vnd				tests-fs-tests		atf,rump
-./usr/tests/fs/tmpfs/t_vnode_leak			tests-fs-tests		atf,rump
+#./usr/tests/fs/tmpfs/t_vnode_leak			tests-fs-tests		atf,rump
 ./usr/tests/fs/umapfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/umapfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/umapfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/umapfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/umapfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/umapfs/t_basic				tests-fs-tests		atf,rump
+#./usr/tests/fs/umapfs/t_basic				tests-fs-tests		atf,rump
 ./usr/tests/fs/union					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/union/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/union/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/union/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/union/Kyuafile				tests-fs-tests		atf,rump,kyua
 ./usr/tests/fs/union/t_basic				tests-obsolete		obsolete,rump
-./usr/tests/fs/union/t_pr				tests-fs-tests		atf,rump
+#./usr/tests/fs/union/t_pr				tests-fs-tests		atf,rump
 ./usr/tests/fs/vfs					tests-fs-tests		compattestfile,atf
-./usr/tests/fs/vfs/Atffile				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/Atffile				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/Kyuafile				tests-fs-tests		atf,rump,kyua
+#./usr/tests/fs/vfs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/vfs/t_full				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_full				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_io					tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_io					tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_renamerace				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_renamerace				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_rmdirrace				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_rmdirrace				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_ro					tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_ro					tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_union				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_union				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_unpriv				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_unpriv				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_vfsops				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_vfsops				tests-fs-tests		atf,rump
-./usr/tests/fs/vfs/t_vnops				tests-fs-tests		atf,rump
+#./usr/tests/fs/vfs/t_vnops				tests-fs-tests		atf,rump
 ./usr/tests/fs/zfs					tests-fs-tests		compattestfile,atf
 ./usr/tests/fs/zfs/Atffile				tests-fs-tests		atf,zfs,rump
 ./usr/tests/fs/zfs/Kyuafile				tests-fs-tests		atf,zfs,rump,kyua
@@ -1546,7 +1546,7 @@
 ./usr/tests/include/sys/t_bitops		tests-include-tests	compattestfile,atf
 ./usr/tests/include/sys/t_bootblock		tests-include-tests	compattestfile,atf
 ./usr/tests/include/sys/t_cdefs			tests-include-tests	compattestfile,atf
-./usr/tests/include/sys/t_socket		tests-include-tests	atf,rump
+#./usr/tests/include/sys/t_socket		tests-include-tests	atf,rump
 ./usr/tests/include/sys/t_tree			tests-include-tests	compattestfile,atf
 ./usr/tests/include/sys/t_types			tests-include-tests	compattestfile,atf
 ./usr/tests/include/t_bitstring			tests-include-tests	compattestfile,atf
@@ -2084,9 +2084,9 @@
 ./usr/tests/kernel/posix_spawn/t_fileactions	tests-kernel-tests	obsolete
 ./usr/tests/kernel/posix_spawn/t_spawn		tests-kernel-tests	obsolete
 ./usr/tests/kernel/posix_spawn/t_spawnattr	tests-kernel-tests	obsolete
-./usr/tests/kernel/t_extattrctl			tests-kernel-tests	atf,rump
+#./usr/tests/kernel/t_extattrctl			tests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_extent			tests-kernel-tests	compattestfile,atf,minix-false
-./usr/tests/kernel/t_filedesc			tests-kernel-tests	atf,rump
+#./usr/tests/kernel/t_filedesc			tests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_kauth_pr_47598		tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_lock			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_lockf			tests-kernel-tests	compattestfile,atf
@@ -2100,7 +2100,7 @@
 ./usr/tests/kernel/t_posix_fallocate		tests-obsolete		obsolete
 ./usr/tests/kernel/t_ps_strings			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_pty			tests-kernel-tests	compattestfile,atf
-./usr/tests/kernel/t_rnd			tests-kernel-tests	atf,rump
+#./usr/tests/kernel/t_rnd			tests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_sigaction			tests-obsolete		obsolete
 ./usr/tests/kernel/t_subr_prf			tests-kernel-tests	compattestfile,atf,minix-false
 ./usr/tests/kernel/t_sysctl			tests-kernel-tests	compattestfile,atf
@@ -2111,9 +2111,9 @@
 ./usr/tests/kernel/t_umountstress		tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_writev			tests-obsolete		obsolete
 ./usr/tests/kernel/tty				tests-kernel-tests	compattestfile,atf
-./usr/tests/kernel/tty/Atffile			tests-kernel-tests	atf,rump
+#./usr/tests/kernel/tty/Atffile			tests-kernel-tests	atf,rump
-./usr/tests/kernel/tty/Kyuafile			tests-kernel-tests	atf,rump,kyua
+#./usr/tests/kernel/tty/Kyuafile			tests-kernel-tests	atf,rump,kyua
-./usr/tests/kernel/tty/t_pr			tests-kernel-tests	atf,rump
+#./usr/tests/kernel/tty/t_pr			tests-kernel-tests	atf,rump
 ./usr/tests/kyua-atf-compat			tests-kyua-tests	compattestfile,atf
 ./usr/tests/kyua-atf-compat/Atffile		tests-kyua-tests	compattestfile,atf,kyua
 ./usr/tests/kyua-atf-compat/Kyuafile		tests-kyua-tests	compattestfile,atf,kyua
@@ -2973,31 +2973,31 @@
 ./usr/tests/lib/librt/t_sched			tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/librt/t_sem			tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/librumpclient				tests-lib-tests		compattestfile,atf
-./usr/tests/lib/librumpclient/Atffile			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumpclient/Atffile			tests-lib-tests		atf,rump
-./usr/tests/lib/librumpclient/Kyuafile			tests-lib-tests		atf,rump,kyua
+#./usr/tests/lib/librumpclient/Kyuafile			tests-lib-tests		atf,rump,kyua
-./usr/tests/lib/librumpclient/h_exec			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumpclient/h_exec			tests-lib-tests		atf,rump
-./usr/tests/lib/librumpclient/h_execthr			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumpclient/h_execthr			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumpclient/h_ution			tests-obsolete		obsolete
-./usr/tests/lib/librumpclient/t_exec			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumpclient/t_exec			tests-lib-tests		atf,rump
-./usr/tests/lib/librumpclient/t_fd			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumpclient/t_fd			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack				tests-lib-tests		compattestfile,atf
-./usr/tests/lib/librumphijack/Atffile			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/Atffile			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/Kyuafile			tests-lib-tests		atf,rump,kyua
+#./usr/tests/lib/librumphijack/Kyuafile			tests-lib-tests		atf,rump,kyua
-./usr/tests/lib/librumphijack/h_client			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/h_client			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/h_cwd			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/h_cwd			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/h_netget			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/h_netget			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/index.html		tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/index.html		tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/netstat.expout		tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/netstat.expout		tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/ssh_config.in		tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/ssh_config.in		tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/ssh_host_key		tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/ssh_host_key		tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/ssh_host_key.pub		tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/ssh_host_key.pub		tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/sshd_config.in		tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/sshd_config.in		tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/t_asyncio			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/t_asyncio			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/t_config			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/t_config			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/t_cwd			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/t_cwd			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/t_sh			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/t_sh			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/t_tcpip			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/t_tcpip			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/t_vfs			tests-lib-tests		atf,rump
+#./usr/tests/lib/librumphijack/t_vfs			tests-lib-tests		atf,rump
 ./usr/tests/lib/libskey					tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libskey/Atffile				tests-lib-tests		compattestfile,atf,skey
 ./usr/tests/lib/libskey/Kyuafile			tests-lib-tests		compattestfile,atf,skey,kyua
@@ -3053,9 +3053,9 @@
 ./usr/tests/lib/semaphore/Atffile		tests-lib-tests		compattestfile,atf,minix-false
 ./usr/tests/lib/semaphore/Kyuafile		tests-lib-tests		compattestfile,atf,kyua,minix-false
 ./usr/tests/lib/semaphore/pthread		tests-lib-tests		compattestfile,atf
-./usr/tests/lib/semaphore/pthread/Atffile	tests-lib-tests		atf,rump
+#./usr/tests/lib/semaphore/pthread/Atffile	tests-lib-tests		atf,rump
-./usr/tests/lib/semaphore/pthread/Kyuafile	tests-lib-tests		atf,rump,kyua
+#./usr/tests/lib/semaphore/pthread/Kyuafile	tests-lib-tests		atf,rump,kyua
-./usr/tests/lib/semaphore/pthread/t_sem_pth	tests-lib-tests		atf,rump
+#./usr/tests/lib/semaphore/pthread/t_sem_pth	tests-lib-tests		atf,rump
 ./usr/tests/libexec				tests-lib-tests	compattestfile,atf
 ./usr/tests/libexec/Atffile			tests-lib-tests		compattestfile,atf
 ./usr/tests/libexec/Kyuafile			tests-lib-tests		compattestfile,atf,kyua
@@ -3103,20 +3103,20 @@
 ./usr/tests/net/Atffile				tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/Kyuafile			tests-net-tests		compattestfile,atf,kyua,minix-false
 ./usr/tests/net/arp				tests-net-tests		compattestfile,atf
-./usr/tests/net/arp/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/arp/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/arp/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/arp/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/arp/t_arp			tests-net-tests		atf,rump
+#./usr/tests/net/arp/t_arp			tests-net-tests		atf,rump
-./usr/tests/net/arp/t_dad			tests-net-tests		atf,rump
+#./usr/tests/net/arp/t_dad			tests-net-tests		atf,rump
 ./usr/tests/net/bpf				tests-net-tests		compattestfile,atf
-./usr/tests/net/bpf/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/bpf/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/bpf/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/bpf/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/bpf/t_bpf			tests-net-tests		atf,rump
+#./usr/tests/net/bpf/t_bpf			tests-net-tests		atf,rump
-./usr/tests/net/bpf/t_div-by-zero		tests-net-tests		atf,rump
+#./usr/tests/net/bpf/t_div-by-zero		tests-net-tests		atf,rump
-./usr/tests/net/bpf/t_mbuf			tests-net-tests		atf,rump
+#./usr/tests/net/bpf/t_mbuf			tests-net-tests		atf,rump
 ./usr/tests/net/bpfilter			tests-net-tests		compattestfile,atf
-./usr/tests/net/bpfilter/Atffile		tests-net-tests		atf,rump
+#./usr/tests/net/bpfilter/Atffile		tests-net-tests		atf,rump
-./usr/tests/net/bpfilter/Kyuafile		tests-net-tests		atf,rump,kyua
+#./usr/tests/net/bpfilter/Kyuafile		tests-net-tests		atf,rump,kyua
-./usr/tests/net/bpfilter/t_bpfilter		tests-net-tests		atf,rump
+#./usr/tests/net/bpfilter/t_bpfilter		tests-net-tests		atf,rump
 ./usr/tests/net/bpfjit				tests-net-tests		compattestfile,atf
 ./usr/tests/net/bpfjit/Atffile			tests-net-tests		atf,rump,sljit
 ./usr/tests/net/bpfjit/Kyuafile			tests-net-tests		atf,rump,sljit,kyua
@@ -3125,9 +3125,9 @@
 ./usr/tests/net/bpfjit/t_extmem			tests-net-tests		atf,rump,sljit
 ./usr/tests/net/bpfjit/t_mbuf			tests-net-tests		atf,rump,sljit
 ./usr/tests/net/carp				tests-net-tests		compattestfile,atf
-./usr/tests/net/carp/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/carp/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/carp/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/carp/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/carp/t_basic			tests-net-tests		atf,rump
+#./usr/tests/net/carp/t_basic			tests-net-tests		atf,rump
 ./usr/tests/net/fdpass				tests-net-tests		compattestfile,atf
 ./usr/tests/net/fdpass/Atffile			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/fdpass/Kyuafile			tests-net-tests		compattestfile,atf,kyua,minix-false
@@ -3135,74 +3135,74 @@
 ./usr/tests/net/fdpass/fdpass64			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/fdpass/t_fdpass			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/icmp				tests-net-tests		compattestfile,atf
-./usr/tests/net/icmp/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/icmp/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/icmp/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/icmp/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/icmp/t_forward			tests-net-tests		atf,rump
+#./usr/tests/net/icmp/t_forward			tests-net-tests		atf,rump
-./usr/tests/net/icmp/t_forward			tests-net-tests		atf,rump
+#./usr/tests/net/icmp/t_forward			tests-net-tests		atf,rump
-./usr/tests/net/icmp/t_icmp6_redirect		tests-net-tests		atf,rump
+#./usr/tests/net/icmp/t_icmp6_redirect		tests-net-tests		atf,rump
-./usr/tests/net/icmp/t_icmp_redirect		tests-net-tests		atf,rump
+#./usr/tests/net/icmp/t_icmp_redirect		tests-net-tests		atf,rump
-./usr/tests/net/icmp/t_ping			tests-net-tests		atf,rump
+#./usr/tests/net/icmp/t_ping			tests-net-tests		atf,rump
-./usr/tests/net/icmp/t_ping2			tests-net-tests		atf,rump
+#./usr/tests/net/icmp/t_ping2			tests-net-tests		atf,rump
 ./usr/tests/net/if				tests-net-tests		compattestfile,atf
-./usr/tests/net/if/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/if/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/if/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/if/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/if/ifconf			tests-net-tests		atf,rump
+#./usr/tests/net/if/ifconf			tests-net-tests		atf,rump
-./usr/tests/net/if/t_compat			tests-net-tests		atf,rump
+#./usr/tests/net/if/t_compat			tests-net-tests		atf,rump
-./usr/tests/net/if/t_ifconf			tests-net-tests		atf,rump
+#./usr/tests/net/if/t_ifconf			tests-net-tests		atf,rump
-./usr/tests/net/if/t_ifconfig			tests-net-tests		atf,rump
+#./usr/tests/net/if/t_ifconfig			tests-net-tests		atf,rump
 ./usr/tests/net/if_bridge			tests-net-tests		compattestfile,atf
-./usr/tests/net/if_bridge/Atffile		tests-net-tests		atf,rump
+#./usr/tests/net/if_bridge/Atffile		tests-net-tests		atf,rump
-./usr/tests/net/if_bridge/Kyuafile		tests-net-tests		atf,rump,kyua
+#./usr/tests/net/if_bridge/Kyuafile		tests-net-tests		atf,rump,kyua
-./usr/tests/net/if_bridge/t_bridge		tests-net-tests		atf,rump
+#./usr/tests/net/if_bridge/t_bridge		tests-net-tests		atf,rump
 ./usr/tests/net/if_loop				tests-net-tests		compattestfile,atf
-./usr/tests/net/if_loop/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/if_loop/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/if_loop/Kyuafile		tests-net-tests		atf,rump,kyua
+#./usr/tests/net/if_loop/Kyuafile		tests-net-tests		atf,rump,kyua
-./usr/tests/net/if_loop/t_pr			tests-net-tests		atf,rump
+#./usr/tests/net/if_loop/t_pr			tests-net-tests		atf,rump
 ./usr/tests/net/in_cksum			tests-net-tests		compattestfile,atf
 ./usr/tests/net/in_cksum/Atffile		tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/in_cksum/Kyuafile		tests-net-tests		compattestfile,atf,kyua,minix-false
 ./usr/tests/net/in_cksum/in_cksum		tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/in_cksum/t_in_cksum		tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/mcast				tests-net-tests		compattestfile,atf
-./usr/tests/net/mcast/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/mcast/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/mcast/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/mcast/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/mcast/mcast			tests-net-tests		atf,rump
+#./usr/tests/net/mcast/mcast			tests-net-tests		atf,rump
-./usr/tests/net/mcast/t_mcast			tests-net-tests		atf,rump
+#./usr/tests/net/mcast/t_mcast			tests-net-tests		atf,rump
 ./usr/tests/net/mpls				tests-net-tests		compattestfile,atf
-./usr/tests/net/mpls/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/mpls/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/mpls/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/mpls/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/mpls/t_ldp_regen		tests-net-tests		atf,rump
+#./usr/tests/net/mpls/t_ldp_regen		tests-net-tests		atf,rump
 ./usr/tests/net/mpls/t_ldp_static		tests-net-tests		obsolete
-./usr/tests/net/mpls/t_mpls_fw			tests-net-tests		atf,rump
+#./usr/tests/net/mpls/t_mpls_fw			tests-net-tests		atf,rump
-./usr/tests/net/mpls/t_mpls_fw6			tests-net-tests		atf,rump
+#./usr/tests/net/mpls/t_mpls_fw6			tests-net-tests		atf,rump
-./usr/tests/net/mpls/t_mpls_fw64		tests-net-tests		atf,rump
+##./usr/tests/net/mpls/t_mpls_fw64		tests-net-tests		atf,rump
-./usr/tests/net/mpls/t_rfc4182			tests-net-tests		atf,rump
+#./usr/tests/net/mpls/t_rfc4182			tests-net-tests		atf,rump
 ./usr/tests/net/ndp				tests-net-tests		compattestfile,atf
-./usr/tests/net/ndp/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/ndp/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/ndp/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/ndp/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/ndp/t_dad			tests-net-tests		atf,rump
+#./usr/tests/net/ndp/t_dad			tests-net-tests		atf,rump
-./usr/tests/net/ndp/t_ndp			tests-net-tests		atf,rump
+#./usr/tests/net/ndp/t_ndp			tests-net-tests		atf,rump
 ./usr/tests/net/net				tests-net-tests		compattestfile,atf
 ./usr/tests/net/net/Atffile			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/net/Kyuafile			tests-net-tests		compattestfile,atf,kyua,minix-false
-./usr/tests/net/net/t_forwarding		tests-net-tests		atf,rump
+#./usr/tests/net/net/t_forwarding		tests-net-tests		atf,rump
-./usr/tests/net/net/t_ipaddress			tests-net-tests		atf,rump
+#./usr/tests/net/net/t_ipaddress			tests-net-tests		atf,rump
-./usr/tests/net/net/t_ipv6_lifetime		tests-net-tests		atf,rump
+#./usr/tests/net/net/t_ipv6_lifetime		tests-net-tests		atf,rump
 ./usr/tests/net/net/t_pktinfo			tests-net-tests		compattestfile,atf,minix-false
-./usr/tests/net/net/t_raw			tests-net-tests		atf,rump
+#./usr/tests/net/net/t_raw			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_tcp			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/net/t_udp			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/net/t_unix			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/npf				tests-net-tests		compattestfile,atf
-./usr/tests/net/npf/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/npf/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/npf/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/npf/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/npf/npftest.conf		tests-net-tests		atf,rump
+#./usr/tests/net/npf/npftest.conf		tests-net-tests		atf,rump
-./usr/tests/net/npf/t_npf			tests-net-tests		atf,rump
+#./usr/tests/net/npf/t_npf			tests-net-tests		atf,rump
 ./usr/tests/net/route				tests-net-tests		compattestfile,atf
-./usr/tests/net/route/Atffile			tests-net-tests		atf,rump
+#./usr/tests/net/route/Atffile			tests-net-tests		atf,rump
-./usr/tests/net/route/Kyuafile			tests-net-tests		atf,rump,kyua
+#./usr/tests/net/route/Kyuafile			tests-net-tests		atf,rump,kyua
-./usr/tests/net/route/t_change			tests-net-tests		atf,rump
+#./usr/tests/net/route/t_change			tests-net-tests		atf,rump
-./usr/tests/net/route/t_flags			tests-net-tests		atf,rump
+#./usr/tests/net/route/t_flags			tests-net-tests		atf,rump
 ./usr/tests/net/sys				tests-net-tests		compattestfile,atf
 ./usr/tests/net/sys/Atffile			tests-net-tests		compattestfile,atf,minix-false
 ./usr/tests/net/sys/Kyuafile			tests-net-tests		compattestfile,atf,kyua,minix-false
@@ -3212,44 +3212,44 @@
 ./usr/tests/net/sys/t_socketpair		tests-obsolete		obsolete
 ./usr/tests/opencrypto				tests-obsolete		obsolete
 ./usr/tests/rump				tests-rump-tests	compattestfile,atf
-./usr/tests/rump/Atffile			tests-rump-tests	atf,rump
+#./usr/tests/rump/Atffile			tests-rump-tests	atf,rump
-./usr/tests/rump/Kyuafile			tests-rump-tests	atf,rump,kyua
+#./usr/tests/rump/Kyuafile			tests-rump-tests	atf,rump,kyua
 ./usr/tests/rump/modautoload			tests-rump-tests	compattestfile,atf
-./usr/tests/rump/modautoload/Atffile		tests-rump-tests	atf,rump
+#./usr/tests/rump/modautoload/Atffile		tests-rump-tests	atf,rump
-./usr/tests/rump/modautoload/Kyuafile		tests-rump-tests	atf,rump,kyua
+#./usr/tests/rump/modautoload/Kyuafile		tests-rump-tests	atf,rump,kyua
-./usr/tests/rump/modautoload/t_modautoload	tests-rump-tests	atf,rump
+#./usr/tests/rump/modautoload/t_modautoload	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern			tests-rump-tests	compattestfile,atf
-./usr/tests/rump/rumpkern/Atffile		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/Atffile		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/Kyuafile		tests-rump-tests	atf,rump,kyua
+#./usr/tests/rump/rumpkern/Kyuafile		tests-rump-tests	atf,rump,kyua
 ./usr/tests/rump/rumpkern/h_client		tests-rump-tests	compattestfile,atf
-./usr/tests/rump/rumpkern/h_client/h_forkcli	tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/h_client/h_forkcli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client/h_reboot	tests-obsolete		obsolete
-./usr/tests/rump/rumpkern/h_client/h_reconcli	tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/h_client/h_reconcli	tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/h_client/h_sigcli	tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/h_client/h_sigcli	tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/h_client/h_simplecli	tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/h_client/h_simplecli	tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/h_client/h_stresscli	tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/h_client/h_stresscli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_server		tests-rump-tests	compattestfile,atf
-./usr/tests/rump/rumpkern/h_server/h_simpleserver	tests-rump-tests	 atf,rump
+#./usr/tests/rump/rumpkern/h_server/h_simpleserver	tests-rump-tests	 atf,rump
-./usr/tests/rump/rumpkern/t_copy		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_copy		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_kern		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_kern		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_lwproc		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_lwproc		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_modcmd		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_modcmd		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_modlinkset		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_modlinkset		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_signals		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_signals		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_sp			tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_sp			tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_threads		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_threads		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_tsleep		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_tsleep		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_vm			tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpkern/t_vm			tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpnet			tests-rump-tests	compattestfile,atf
-./usr/tests/rump/rumpnet/Atffile		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpnet/Atffile		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpnet/Kyuafile		tests-rump-tests	atf,rump,kyua
+#./usr/tests/rump/rumpnet/Kyuafile		tests-rump-tests	atf,rump,kyua
-./usr/tests/rump/rumpnet/t_shmif		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpnet/t_shmif		tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpvfs			tests-rump-tests	compattestfile,atf
-./usr/tests/rump/rumpvfs/Atffile		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpvfs/Atffile		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpvfs/Kyuafile		tests-rump-tests	atf,rump,kyua
+#./usr/tests/rump/rumpvfs/Kyuafile		tests-rump-tests	atf,rump,kyua
-./usr/tests/rump/rumpvfs/t_basic		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpvfs/t_basic		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpvfs/t_etfs			tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpvfs/t_etfs			tests-rump-tests	atf,rump
-./usr/tests/rump/rumpvfs/t_p2kifs		tests-rump-tests	atf,rump
+#./usr/tests/rump/rumpvfs/t_p2kifs		tests-rump-tests	atf,rump
 ./usr/tests/sbin				tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/Atffile			tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/Kyuafile			tests-sbin-tests	compattestfile,atf,kyua

lib/Makefile

@@ -99,7 +99,7 @@ SUBDIR+=	libc_vfp
 .endif
 .endif
 .if (${MKRUMP} != "no")
-SUBDIR+=	librumpclient
+#SUBDIR+=	librumpclient
 .endif
 .if (${MKSKEY} != "no")
 SUBDIR+=	libskey
@@ -189,8 +189,8 @@ SUBDIR+=	libexecinfo 	# depends on libelf
 SUBDIR+=	librefuse	# depends on libpuffs
 #SUBDIR+=	libisns 	# depends on libpthread
 .if (${MKRUMP} != "no")
-SUBDIR+=	librumpuser	# depends on libpthread
+#SUBDIR+=	librumpuser	# depends on libpthread
-SUBDIR+=	librumphijack	# depends on librumpclient and libpthread
+#SUBDIR+=	librumphijack	# depends on librumpclient and libpthread
 .endif
 
 .if (${MKNPF} != "no")
@@ -255,7 +255,7 @@ SUBDIR+=	libform		# depends on libcurses
 SUBDIR+=	libmenu		# depends on libcurses
 #SUBDIR+=	libradius	# depends on libcrypto if (${MKCRYPTO} != "no")
 .if (${MKRUMP} != "no")
-SUBDIR+=	librump		# depends on librumpuser
+#SUBDIR+=	librump		# depends on librumpuser
 .endif
 
 .if (${MKKERBEROS} != "no")
@@ -288,9 +288,9 @@ SUBDIR+=        ../external/cddl/osnet/lib/libdtrace	# depends on libproc
 .endif
 
 .if (${MKRUMP} != "no")
-SUBDIR+=	librumpdev	# depends on librump
+#SUBDIR+=	librumpdev	# depends on librump
-SUBDIR+=	librumpnet	# depends on librump
+#SUBDIR+=	librumpnet	# depends on librump
-SUBDIR+=	librumpvfs	# depends on librump
+#SUBDIR+=	librumpvfs	# depends on librump
 .endif
 
 .if (${MKPAM} != "no")
@@ -307,7 +307,7 @@ SUBDIR+=	../external/bsd/mdocml/lib
 #==================== 4th library dependency barrier ====================
 SUBDIR+=	.WAIT
 
-SUBDIR+=	libukfs		# depends on librumpvfs, librump
+#SUBDIR+=	libukfs		# depends on librumpvfs, librump
 
 .if (${MKTPM} != "no")
 SUBDIR+=	../crypto/external/cpl/trousers/lib
@@ -316,17 +316,17 @@ SUBDIR+=	../crypto/external/cpl/trousers/lib
 #==================== 5th library dependency barrier ====================
 SUBDIR+=	.WAIT
 
-SUBDIR+=	libp2k		# depends on libukfs, librumpvfs, libpuffs
+#SUBDIR+=	libp2k		# depends on libukfs, librumpvfs, libpuffs
 
 .if (${MKTPM} != "no")
 SUBDIR+=	../crypto/external/cpl/tpm-tools/lib	# depends on trousers
 .endif
 
 .if !defined(BSD_MK_COMPAT_FILE)
-SUBDIR+=	../sys/rump/dev/lib
+#SUBDIR+=	../sys/rump/dev/lib
-SUBDIR+=	../sys/rump/fs/lib
+#SUBDIR+=	../sys/rump/fs/lib
-SUBDIR+=	../sys/rump/kern/lib
+#SUBDIR+=	../sys/rump/kern/lib
-SUBDIR+=	../sys/rump/net/lib
+#SUBDIR+=	../sys/rump/net/lib
 .endif
 .endif
 

share/mk/bsd.own.mk

@@ -58,7 +58,6 @@ MKNPF:=		no
 MKPAM:=		no
 MKPF:=		no
 MKPOSTFIX:=	no
-MKRUMP:=	no
 MKSKEY:=	no
 MKYP:=		no
 MKCROSSGDB:=	no

share/mk/bsd.prog.mk

@@ -378,6 +378,15 @@ LDSTATIC=	-dynamic
 .endif
 
 .if defined(RUMPPRG)
+. if defined(__MINIX)
+PROG=			${RUMPPRG}
+PROGS=			${RUMPPRG}
+.  if defined(SRCS)
+SRCS+=			${PROG}_hostops.c
+.  else
+SRCS=			${PROG}.c ${PROG}_hostops.c
+. endif
+.else
 PROG=			${RUMPPRG}
 . ifndef CRUNCHEDPROG
 .  if (${MKRUMP} != "no")
@@ -408,6 +417,7 @@ PROGS=			${PROG}
 CPPFLAGS+=		-DCRUNCHOPS
 . endif
 .endif
+.endif
 
 .if defined(PROG)
 _CCLINK?=	${CC} ${_CCLINKFLAGS}

tests/Makefile

@@ -12,7 +12,7 @@ TESTS_SUBDIRS=		bin dev games include kernel lib libexec
 TESTS_SUBDIRS+=		sbin sys usr.bin usr.sbin
 
 . if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
-TESTS_SUBDIRS+=		fs rump
+#TESTS_SUBDIRS+=		fs rump
 
 . if ${MKKMOD} != "no"
 TESTS_SUBDIRS+=		modules

tests/dev/Makefile

@@ -7,7 +7,7 @@ TESTSDIR=	${TESTSBASE}/dev
 
 TESTS_SUBDIRS+=	cgd raidframe
 .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) 
-TESTS_SUBDIRS+=	audio md scsipi sysmon
+#TESTS_SUBDIRS+=	audio md scsipi sysmon
 .endif
 
 

tests/include/sys/Makefile

@@ -10,10 +10,12 @@ TESTS_C=		t_bitops t_bootblock t_cdefs t_tree t_types
 
 LDADD.t_bitops+=	-lm
 
+.if !defined(__MINIX)
 .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_C+= t_socket
 LDADD.t_socket+=	-lrumpnet_local -lrumpnet_net -lrumpnet
 LDADD.t_socket+=	-lrumpvfs -lrump -lrumpuser -lpthread
 .endif
+.endif
 
 .include <bsd.test.mk>

tests/kernel/Makefile

@@ -30,7 +30,7 @@ PROGS+=		h_ps_strings2
 
 LDADD.t_mqueue+= -lrt
 
-
+.if !defined(__MINIX)
 .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS+=	tty
 
@@ -46,7 +46,6 @@ LDADD.t_rnd+=  -lrump -lpthread
 .endif
 
 
-.if !defined(__MINIX)
 .PATH:			${NETBSDSRCDIR}/sys/kern
 TESTS_C+=		t_extent
 SRCS.t_extent=		t_extent.c subr_extent.c

tests/lib/Makefile

@@ -10,9 +10,11 @@ TESTS_SUBDIRS=	csu libc libcrypt libcurses libevent libexecinfo \
 		libm libprop  \
 		libutil
 
+.if !defined(__MINIX)
 .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS+= librumpclient librumphijack
 .endif
+.endif
 
 .if ${MKCRYPTO} != "no"
 TESTS_SUBDIRS+= libdes

usr.bin/Makefile

@@ -48,8 +48,8 @@ SUBDIR+= apropos whatis
 .endif
 
 .if (${MKRUMP} != "no")
-SUBDIR+= rump_allserver rump_dhcpclient rump_halt rump_server shmif_dumpbus \
+#SUBDIR+= rump_allserver rump_dhcpclient rump_halt rump_server shmif_dumpbus \
-	rump_wmd
+#	rump_wmd
 .endif
 
 .if (${MKBSDGREP} != "no")

usr.sbin/Makefile

@@ -44,7 +44,7 @@ SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset
 .endif
 
 .if (${MKRUMP} != "no")
-SUBDIR+= puffs
+#SUBDIR+= puffs
 .endif
 
 .if ${TOOLCHAIN_MISSING} != "no"