test-appliance: change the comment delimiter for exclude files to //

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

68 files changed, 393 insertions, 400 deletions

diff --git a/test-appliance/files/root/fs/btrfs/cfg/4k.exclude b/test-appliance/files/root/fs/btrfs/cfg/4k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/btrfs/cfg/4k.exclude
+++ b/test-appliance/files/root/fs/btrfs/cfg/4k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/btrfs/cfg/64k.exclude b/test-appliance/files/root/fs/btrfs/cfg/64k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/btrfs/cfg/64k.exclude
+++ b/test-appliance/files/root/fs/btrfs/cfg/64k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/btrfs/exclude b/test-appliance/files/root/fs/btrfs/exclude
index 6302775f..c357cd3f 100644
--- a/test-appliance/files/root/fs/btrfs/exclude
+++ b/test-appliance/files/root/fs/btrfs/exclude
@@ -1,3 +1,3 @@
-# generic/647 causes the VM to crash.  For more information see:
-# https://lore.kernel.org/linux-btrfs/20211023115852.2517.409509F4@e16-tech.com/T/
+// generic/647 causes the VM to crash.  For more information see:
+// https://lore.kernel.org/linux-btrfs/20211023115852.2517.409509F4@e16-tech.com/T/
 generic/647
diff --git a/test-appliance/files/root/fs/exclude.gce b/test-appliance/files/root/fs/exclude.gce
index e1be7f3a..7f1ccdbd 100644
--- a/test-appliance/files/root/fs/exclude.gce
+++ b/test-appliance/files/root/fs/exclude.gce
@@ -1,5 +1,5 @@
-# This test takes hotplug CPU's off-line and this apparently causes
-# an instant reboot.  This doesn't happen on KVM, but it does happen
-# when running the same kernel on GCE.
-#
+// This test takes hotplug CPU's off-line and this apparently causes
+// an instant reboot.  This doesn't happen on KVM, but it does happen
+// when running the same kernel on GCE.
+//
 generic/650
diff --git a/test-appliance/files/root/fs/ext2/exclude b/test-appliance/files/root/fs/ext2/exclude
index 58a52a69..9c01520b 100644
--- a/test-appliance/files/root/fs/ext2/exclude
+++ b/test-appliance/files/root/fs/ext2/exclude
@@ -1,14 +1,13 @@
-#
-# ext4/023 tests the populate function which needs to require files with
-# extents.  This doesn't work with ext2, naturally.
+// ext4/023 tests the populate function which needs to require files with
+// extents.  This doesn't work with ext2, naturally.
 ext4/023
 
-# The generic/382 test fails on ext2 because the indirect blocks
-# are included in the quota report, and so the resulting quota
-# report output is different from what is expected in the 382.out file
+// The generic/382 test fails on ext2 because the indirect blocks
+// are included in the quota report, and so the resulting quota
+// report output is different from what is expected in the 382.out file
 generic/382
 
-# The generic/235 test fails for the same rason as generic/382 above
-# after xfstests 4f4b89cdf353 which was fixing the test for 64k block
-# sizes.  Unfortunately it breaks the test which use indirect blocks.
+// The generic/235 test fails for the same rason as generic/382 above
+// after xfstests 4f4b89cdf353 which was fixing the test for 64k block
+// sizes.  Unfortunately it breaks the test which use indirect blocks.
 generic/235
diff --git a/test-appliance/files/root/fs/ext3/exclude b/test-appliance/files/root/fs/ext3/exclude
index 899c8426..27af4a99 100644
--- a/test-appliance/files/root/fs/ext3/exclude
+++ b/test-appliance/files/root/fs/ext3/exclude
@@ -1,14 +1,13 @@
-#
-# ext4/023 tests the populate function which needs to require files with
-# extents.  This doesn't work with ext3, naturally.
+// ext4/023 tests the populate function which needs to require files with
+// extents.  This doesn't work with ext3, naturally.
 ext4/023
 
-# The generic/382 test fails on ext3 because the indirect blocks
-# are included in the quota report, and so the resulting quota
-# report output is different from what is expected in the 382.out file
+// The generic/382 test fails on ext3 because the indirect blocks
+// are included in the quota report, and so the resulting quota
+// report output is different from what is expected in the 382.out file
 generic/382
 
-# The generic/235 test fails for the same rason as generic/382 above
-# after xfstests 4f4b89cdf353 which was fixing the test for 64k block
-# sizes.  Unfortunately it breaks the test which use indirect blocks.
+// The generic/235 test fails for the same rason as generic/382 above
+// after xfstests 4f4b89cdf353 which was fixing the test for 64k block
+// sizes.  Unfortunately it breaks the test which use indirect blocks.
 generic/235
diff --git a/test-appliance/files/root/fs/ext4/cfg/1k.exclude b/test-appliance/files/root/fs/ext4/cfg/1k.exclude
index df0109bd..f3d30bbf 100644
--- a/test-appliance/files/root/fs/ext4/cfg/1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/1k.exclude
@@ -1,20 +1,20 @@
-# The test fails due to too many block group descriptors when the
-# block size is 1k
+// The test fails due to too many block group descriptors when the
+// block size is 1k
 ext4/033
 
-# This test tries to create 65536 directories, and with 1k blocks,
-# and long names, we run out of htree depth
+// This test tries to create 65536 directories, and with 1k blocks,
+// and long names, we run out of htree depth
 ext4/045
 
-# This test creates too many inodes on when the block size is 1k
-# without using special mkfs.ext4 options to change the inode size.
-# This test is a bit bogus anyway, and uses a bunch of magic calculations
-# where it's not clear what it was originally trying to test in the
-# first place.  So let's just skip it for now.
+// This test creates too many inodes on when the block size is 1k
+// without using special mkfs.ext4 options to change the inode size.
+// This test is a bit bogus anyway, and uses a bunch of magic calculations
+// where it's not clear what it was originally trying to test in the
+// first place.  So let's just skip it for now.
 generic/273
 
-# This test creates too many extended attributes to fit in a 1k block
+// This test creates too many extended attributes to fit in a 1k block
 generic/454
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/2k.exclude b/test-appliance/files/root/fs/ext4/cfg/2k.exclude
index e1ffba5e..41a03961 100644
--- a/test-appliance/files/root/fs/ext4/cfg/2k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/2k.exclude
@@ -1,9 +1,9 @@
-# This test creates too many inodes on when the block size is 1k
-# without using special mkfs.ext4 options to change the inode size.
-# This test is a bit bogus anyway, and uses a bunch of magic calculations
-# where it's not clear what it was originally trying to test in the
-# first place.  So let's just skip it for now.
+// This test creates too many inodes on when the block size is 1k
+// without using special mkfs.ext4 options to change the inode size.
+// This test is a bit bogus anyway, and uses a bunch of magic calculations
+// where it's not clear what it was originally trying to test in the
+// first place.  So let's just skip it for now.
 generic/273
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/4k.exclude b/test-appliance/files/root/fs/ext4/cfg/4k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/ext4/cfg/4k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/4k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/64k.exclude b/test-appliance/files/root/fs/ext4/cfg/64k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/ext4/cfg/64k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/64k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/adv.exclude b/test-appliance/files/root/fs/ext4/cfg/adv.exclude
index 42d7451a..432a954b 100644
--- a/test-appliance/files/root/fs/ext4/cfg/adv.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/adv.exclude
@@ -1,12 +1,12 @@
-ext4/004	# dump/restore doesn't handle inline data
+ext4/004	// dump/restore doesn't handle inline data
 
-# ext4/044 tries to mount the file system as ext3 explicitly.  This will
-# fail because ext3 and the inline_data feature are incompatible.
+// ext4/044 tries to mount the file system as ext3 explicitly.  This will
+// fail because ext3 and the inline_data feature are incompatible.
 ext4/044
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/adv2.exclude b/test-appliance/files/root/fs/ext4/cfg/adv2.exclude
index b6c802d3..f3aac2db 100644
--- a/test-appliance/files/root/fs/ext4/cfg/adv2.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/adv2.exclude
@@ -1,8 +1,8 @@
-ext4/004	# dump/restore doesn't handle inline data
+ext4/004	// dump/restore doesn't handle inline data
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/bigalloc.exclude b/test-appliance/files/root/fs/ext4/cfg/bigalloc.exclude
index 20fd39b7..785edb49 100644
--- a/test-appliance/files/root/fs/ext4/cfg/bigalloc.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/bigalloc.exclude
@@ -1,44 +1,44 @@
-ext4/004	# dump/restore doesn't handle the bigalloc feature
+ext4/004	// dump/restore doesn't handle the bigalloc feature
 
-# ext4/033 creates a special file system using dmhugedisk to test for
-# inode overflow when online resizing.  With a bigalloc config, this takes
-# too much space, so test VM will hang or abort the test run.  We
-# don't need to test this for all file system configs, so just skip it here.
+// ext4/033 creates a special file system using dmhugedisk to test for
+// inode overflow when online resizing.  With a bigalloc config, this takes
+// too much space, so test VM will hang or abort the test run.  We
+// don't need to test this for all file system configs, so just skip it here.
 ext4/033
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# This test needs to know the inode size and block size for the file
-# system; for bigalloc, we need to use the cluster size instead of the
-# block size.
+// This test needs to know the inode size and block size for the file
+// system; for bigalloc, we need to use the cluster size instead of the
+// block size.
 generic/204
 
-# This test is a quota accounting test.  For bigalloc, the cluster
-# size of 64k is way too big to deal with the artificial fudge used
-# in the test to deal with wrong block sizes.  The test really needs
-# to be rewritten to understand block/allocation sizes....
+// This test is a quota accounting test.  For bigalloc, the cluster
+// size of 64k is way too big to deal with the artificial fudge used
+// in the test to deal with wrong block sizes.  The test really needs
+// to be rewritten to understand block/allocation sizes....
 generic/219
 
-# This test uses the block size to figure out how many files to
-# create; for bigalloc, we need to use the cluster size instead of the
-# block size.
+// This test uses the block size to figure out how many files to
+// create; for bigalloc, we need to use the cluster size instead of the
+// block size.
 generic/273
 
-# This test creates a very small file system on a dm-thin device.
-# The file system is too small for bigalloc, so skip it.  It was
-# introduced to test a dm-thin bug combined with an XFS bug regression.
-# If it's a problem for ext4, we'll catch it in other ext4 configs.
+// This test creates a very small file system on a dm-thin device.
+// The file system is too small for bigalloc, so skip it.  It was
+// introduced to test a dm-thin bug combined with an XFS bug regression.
+// If it's a problem for ext4, we'll catch it in other ext4 configs.
 generic/500
 
-# These tests assume that the directory will get expanded when
-# additional entries are added.  With bigalloc and with htree
-# directories, this is not the case.  Since no blocks are added,
-# there is no attempted block allocation and so the expected
-# EDQUOT failure didn't happen.
+// These tests assume that the directory will get expanded when
+// additional entries are added.  With bigalloc and with htree
+// directories, this is not the case.  Since no blocks are added,
+// there is no attempted block allocation and so the expected
+// EDQUOT failure didn't happen.
 generic/681
 generic/682
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/bigalloc_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/bigalloc_1k.exclude
index 37d438e6..a011c15f 100644
--- a/test-appliance/files/root/fs/ext4/cfg/bigalloc_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/bigalloc_1k.exclude
@@ -1,45 +1,45 @@
-ext4/004	# dump/restore doesn't handle the bigalloc feature
+ext4/004	// dump/restore doesn't handle the bigalloc feature
 
-# ext4/033 creates a special file system using dmhugedisk to test for
-# inode overflow when online resizing.  With a bigalloc config, this takes
-# too much space, so test VM will hang or abort the test run.  We
-# don't need to test this for all file system configs, so just skip it here.
+// ext4/033 creates a special file system using dmhugedisk to test for
+// inode overflow when online resizing.  With a bigalloc config, this takes
+// too much space, so test VM will hang or abort the test run.  We
+// don't need to test this for all file system configs, so just skip it here.
 ext4/033
 
-# This test tries to create 65536 directories, and with 1k blocks,
-# and long names, we run out of htree depth
+// This test tries to create 65536 directories, and with 1k blocks,
+// and long names, we run out of htree depth
 ext4/045
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# This test creates too many extended attributes to fit in a 1k block
+// This test creates too many extended attributes to fit in a 1k block
 generic/454
 
-# This test needs to know the inode size and block size for the file
-# system; for bigalloc, we need to use the cluster size instead of the
-# block size.
+// This test needs to know the inode size and block size for the file
+// system; for bigalloc, we need to use the cluster size instead of the
+// block size.
 generic/204
 
-# This test uses the block size to figure out how many files to
-# create; for bigalloc, we need to use the cluster size instead of the
-# block size.
+// This test uses the block size to figure out how many files to
+// create; for bigalloc, we need to use the cluster size instead of the
+// block size.
 generic/273
 
-# This test creates a very small file system on a dm-thin device.
-# The file system is too small for bigalloc, so skip it.  It was
-# introduced to test a dm-thin bug combined with an XFS bug regression.
-# If it's a problem for ext4, we'll catch it in other ext4 configs.
+// This test creates a very small file system on a dm-thin device.
+// The file system is too small for bigalloc, so skip it.  It was
+// introduced to test a dm-thin bug combined with an XFS bug regression.
+// If it's a problem for ext4, we'll catch it in other ext4 configs.
 generic/500
 
-# These tests assume that the directory will get expanded when
-# additional entries are added.  With bigalloc and with htree
-# directories, this is not the case.  Since no blocks are added,
-# there is no attempted block allocation and so the expected
-# EDQUOT failure didn't happen.
+// These tests assume that the directory will get expanded when
+// additional entries are added.  With bigalloc and with htree
+// directories, this is not the case.  Since no blocks are added,
+// there is no attempted block allocation and so the expected
+// EDQUOT failure didn't happen.
 generic/681
 generic/682
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/bigalloc_inline.exclude b/test-appliance/files/root/fs/ext4/cfg/bigalloc_inline.exclude
index 03f4b53d..5bbb1721 100644
--- a/test-appliance/files/root/fs/ext4/cfg/bigalloc_inline.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/bigalloc_inline.exclude
@@ -1,14 +1,14 @@
-ext4/004	# dump/restore doesn't handle the bigalloc feature
+ext4/004	// dump/restore doesn't handle the bigalloc feature
 
-# ext4/033 creates a special file system using dmhugedisk to test for
-# inode overflow when online resizing.  With a bigalloc config, this takes
-# too much space, so test VM will hang or abort the test run.  We
-# don't need to test this for all file system configs, so just skip it here.
+// ext4/033 creates a special file system using dmhugedisk to test for
+// inode overflow when online resizing.  With a bigalloc config, this takes
+// too much space, so test VM will hang or abort the test run.  We
+// don't need to test this for all file system configs, so just skip it here.
 ext4/033
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/data_journal.exclude b/test-appliance/files/root/fs/ext4/cfg/data_journal.exclude
index f8a3a0d5..130ce821 100644
--- a/test-appliance/files/root/fs/ext4/cfg/data_journal.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/data_journal.exclude
@@ -1,23 +1,23 @@
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# In data=journal mode, fsync() will try to write data blocks into
-# the journal.  This will cause the file system to go read-only
-# when the journal aborts as a result of the device being put
-# into dm-error mode, and this guarantees that this test will fail.
+// In data=journal mode, fsync() will try to write data blocks into
+// the journal.  This will cause the file system to go read-only
+// when the journal aborts as a result of the device being put
+// into dm-error mode, and this guarantees that this test will fail.
 generic/441
 
-# Ext4 doesn't suppport mounting with norecovery && data=journal.
-# We could fix this in the future by no giving an error in the case
-# where we are mounting with ro, norecovery, and data=journal.
-# (XFS requires ro with norecovery, and perhaps we should make
-# a similar restriction.)
+// Ext4 doesn't suppport mounting with norecovery && data=journal.
+// We could fix this in the future by no giving an error in the case
+// where we are mounting with ro, norecovery, and data=journal.
+// (XFS requires ro with norecovery, and perhaps we should make
+// a similar restriction.)
 generic/537
 
-# This test uses dioread_nolock which currently isn't supported with
-# data=journal
+// This test uses dioread_nolock which currently isn't supported with
+// data=journal
 ext4/034
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/dax.exclude b/test-appliance/files/root/fs/ext4/cfg/dax.exclude
index 18f3bde1..4598deba 100644
--- a/test-appliance/files/root/fs/ext4/cfg/dax.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/dax.exclude
@@ -1,3 +1,3 @@
-# DAX and encryption don't mix since the page cache is now using DAX
-# memory directly.
+// DAX and encryption don't mix since the page cache is now using DAX
+// memory directly.
 -g encrypt
diff --git a/test-appliance/files/root/fs/ext4/cfg/dioread_nolock.exclude b/test-appliance/files/root/fs/ext4/cfg/dioread_nolock.exclude
index d40ddd35..d8a01351 100644
--- a/test-appliance/files/root/fs/ext4/cfg/dioread_nolock.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/dioread_nolock.exclude
@@ -1,10 +1,10 @@
-# ext4/044 tries to mount the file system as ext3 explicitly, but
-# since we pass dioread_nolock, this test will fail.
+// ext4/044 tries to mount the file system as ext3 explicitly, but
+// since we pass dioread_nolock, this test will fail.
 ext4/044
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/dioread_nolock_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/dioread_nolock_1k.exclude
index b64d6b79..cca51d92 100644
--- a/test-appliance/files/root/fs/ext4/cfg/dioread_nolock_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/dioread_nolock_1k.exclude
@@ -1,16 +1,16 @@
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# This test creates too many inodes on when the block size is 1k
-# without using special mkfs.ext4 options to change the inode size.
-# This test is a bit bogus anyway, and uses a bunch of magic calculations
-# where it's not clear what it was originally trying to test in the
-# first place.  So let's just skip it for now.
+// This test creates too many inodes on when the block size is 1k
+// without using special mkfs.ext4 options to change the inode size.
+// This test is a bit bogus anyway, and uses a bunch of magic calculations
+// where it's not clear what it was originally trying to test in the
+// first place.  So let's just skip it for now.
 generic/273
 
-# This test creates too many extended attributes to fit in a 1k block
+// This test creates too many extended attributes to fit in a 1k block
 generic/454
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/discard-4k.exclude b/test-appliance/files/root/fs/ext4/cfg/discard-4k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/ext4/cfg/discard-4k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/discard-4k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/ea_inode.exclude b/test-appliance/files/root/fs/ext4/cfg/ea_inode.exclude
index 7c76b877..759d2432 100644
--- a/test-appliance/files/root/fs/ext4/cfg/ea_inode.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/ea_inode.exclude
@@ -1,4 +1,4 @@
-ext4/004	# dump/restore doesn't handle the ea_inode feature
+ext4/004	// dump/restore doesn't handle the ea_inode feature
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/ea_inode_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/ea_inode_1k.exclude
index 6b587ca4..5bf05749 100644
--- a/test-appliance/files/root/fs/ext4/cfg/ea_inode_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/ea_inode_1k.exclude
@@ -1,11 +1,11 @@
-ext4/004	# dump/restore doesn't handle the ea_inode feature
+ext4/004	// dump/restore doesn't handle the ea_inode feature
 
-# This test creates too many inodes on when the block size is 1k
-# without using special mkfs.ext4 options to change the inode size.
-# This test is a bit bogus anyway, and uses a bunch of magic calculations
-# where it's not clear what it was originally trying to test in the
-# first place.  So let's just skip it for now.
+// This test creates too many inodes on when the block size is 1k
+// without using special mkfs.ext4 options to change the inode size.
+// This test is a bit bogus anyway, and uses a bunch of magic calculations
+// where it's not clear what it was originally trying to test in the
+// first place.  So let's just skip it for now.
 generic/273
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/encrypt.exclude b/test-appliance/files/root/fs/ext4/cfg/encrypt.exclude
index 21a8b45f..695517de 100644
--- a/test-appliance/files/root/fs/ext4/cfg/encrypt.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/encrypt.exclude
@@ -1,25 +1,25 @@
-ext4/004	# dump/restore doesn't handle quotas
+ext4/004	// dump/restore doesn't handle quotas
 
-# These tests try to create extended attributes which are
-# large enough to stress the limits of the available
-# xattr size.  This causes problems with encryption
-# which requires its own xattrs which take space.
+// These tests try to create extended attributes which are
+// large enough to stress the limits of the available
+// xattr size.  This causes problems with encryption
+// which requires its own xattrs which take space.
 ext4/022
 ext4/023
 ext4/026
 ext4/028
 
-# file systems with encryption enabled can't be mounted with ext3
+// file systems with encryption enabled can't be mounted with ext3
 ext4/044
 
-# This test to make sure ext4 directory entries are appropriately
-# wiped after a file is deleted, or after htree operations is
-# incompatible with an encrypted directory.
+// This test to make sure ext4 directory entries are appropriately
+// wiped after a file is deleted, or after htree operations is
+// incompatible with an encrypted directory.
 ext4/048
 
-# These tests use the old-style quota support where the quota files are user
-# files instead of hidden inodes.  This isn't compatible with
-# test_dummy_encryption, as it causes the quota files to be encrypted.
+// These tests use the old-style quota support where the quota files are user
+// files instead of hidden inodes.  This isn't compatible with
+// test_dummy_encryption, as it causes the quota files to be encrypted.
 generic/082
 generic/219
 generic/230
@@ -35,10 +35,10 @@ generic/587
 generic/600
 generic/601
 
-# generic/204 tests ENOSPC handling; it doesn't correctly
-# anticipate the external extended attribute required when
-# using a 1k block size
+// generic/204 tests ENOSPC handling; it doesn't correctly
+// anticipate the external extended attribute required when
+// using a 1k block size
 generic/204
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/encrypt_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/encrypt_1k.exclude
index 5f74b5a7..ea52979e 100644
--- a/test-appliance/files/root/fs/ext4/cfg/encrypt_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/encrypt_1k.exclude
@@ -1,10 +1,10 @@
-# These tests are also excluded in encrypt.exclude.
-# See there for the reasons.
-#
-# Due to the 1k block size, ext4/023 and ext4/028 also fail for a second reason:
-# they use _scratch_populate_cached() which tries to create a 1023-byte symlink,
-# which fails with encrypt_1k because encrypted symlinks are limited to
-# blocksize-3 bytes, not blocksize-1 as is the case for no encryption.
+// These tests are also excluded in encrypt.exclude.
+// See there for the reasons.
+//
+// Due to the 1k block size, ext4/023 and ext4/028 also fail for a second reason:
+// they use _scratch_populate_cached() which tries to create a 1023-byte symlink,
+// which fails with encrypt_1k because encrypted symlinks are limited to
+// blocksize-3 bytes, not blocksize-1 as is the case for no encryption.
 ext4/004
 ext4/022
 ext4/023
@@ -24,10 +24,10 @@ generic/587
 generic/600
 generic/601
 
-# These tests are also excluded in 1k.exclude.
-# See there for the reasons.
+// These tests are also excluded in 1k.exclude.
+// See there for the reasons.
 generic/273
 generic/454
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/ext3.exclude b/test-appliance/files/root/fs/ext4/cfg/ext3.exclude
index ca200e27..b79dc439 100644
--- a/test-appliance/files/root/fs/ext4/cfg/ext3.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/ext3.exclude
@@ -1,46 +1,46 @@
-# ext4/023 tests the populate function which needs to require files with
-# extents.  This doesn't work with ext3, naturally.
+// ext4/023 tests the populate function which needs to require files with
+// extents.  This doesn't work with ext3, naturally.
 ext4/023
 
-# ext4/044 tries to mount the file system as ext3 explicitly, but
-# since we pass nodelalloc, this test will fail.
+// ext4/044 tries to mount the file system as ext3 explicitly, but
+// since we pass nodelalloc, this test will fail.
 ext4/044
 
-# ext4/033 creates a special file system using dmhugedisk to test for
-# inode overflow when online resizing.  With an ext3 config, this takes
-# too much space, so test VM will hang or abort the test run.  We
-# don't need to test this for all file system configs, so just skip it here.
+// ext4/033 creates a special file system using dmhugedisk to test for
+// inode overflow when online resizing.  With an ext3 config, this takes
+// too much space, so test VM will hang or abort the test run.  We
+// don't need to test this for all file system configs, so just skip it here.
 ext4/033
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# The generic/382 test fails on ext3 because the indirect blocks
-# are included in the quota report, and so the resulting quota
-# report output is different from what is expected in the 382.out file
+// The generic/382 test fails on ext3 because the indirect blocks
+// are included in the quota report, and so the resulting quota
+// report output is different from what is expected in the 382.out file
 generic/382
 
-# The generic/235 test fails for the same rason as generic/382 above
-# after xfstests 4f4b89cdf353 which was fixing the test for 64k block
-# sizes.  Unfortunately it breaks the test which use indirect blocks.
+// The generic/235 test fails for the same rason as generic/382 above
+// after xfstests 4f4b89cdf353 which was fixing the test for 64k block
+// sizes.  Unfortunately it breaks the test which use indirect blocks.
 generic/235
 
-# Ext3 does not support file systems > 16TB
+// Ext3 does not support file systems > 16TB
 generic/620
 
-# The generic/635 test tries to call the shutdown ioctl with the
-# LOGFLUSH flag, which unfortunately will does not work well with
-# nodelalloc mount option (which the conv configuration uses).
-# This is because once we are in shutdown state, any attempt to write
-# an inode fails with an EIO --- but this means that the data=ordered
-# writeback will fail with an EIO and this causes the LOGFLUSH commit
-# fail, which in turn means the $SCRATCH_MNT/t_* files do not survive
-# the shutdown, causing generic/635 to fail.  We are not likely going
-# to fix this before we rework ext4's writeback strategy to remove the
-# data=ordered writeback entirely, so let's just exclude this test for
-# now.
+// The generic/635 test tries to call the shutdown ioctl with the
+// LOGFLUSH flag, which unfortunately will does not work well with
+// nodelalloc mount option (which the conv configuration uses).
+// This is because once we are in shutdown state, any attempt to write
+// an inode fails with an EIO --- but this means that the data=ordered
+// writeback will fail with an EIO and this causes the LOGFLUSH commit
+// fail, which in turn means the $SCRATCH_MNT/t_* files do not survive
+// the shutdown, causing generic/635 to fail.  We are not likely going
+// to fix this before we rework ext4's writeback strategy to remove the
+// data=ordered writeback entirely, so let's just exclude this test for
+// now.
 generic/635
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/ext3conv.exclude b/test-appliance/files/root/fs/ext4/cfg/ext3conv.exclude
index 5b854ce4..7aca315e 100644
--- a/test-appliance/files/root/fs/ext4/cfg/ext3conv.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/ext3conv.exclude
@@ -1,23 +1,23 @@
-# ext4/044 tries to mount the file system as ext3 explicitly, but
-# since we pass nodelalloc, this test will fail.
+// ext4/044 tries to mount the file system as ext3 explicitly, but
+// since we pass nodelalloc, this test will fail.
 ext4/044
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# The generic/635 test tries to call the shutdown ioctl with the
-# LOGFLUSH flag, which unfortunately will does not work well with
-# nodelalloc mount option (which the ext3conv configuration uses).
-# This is because once we are in shutdown state, any attempt to write
-# an inode fails with an EIO --- but this means that the data=ordered
-# writeback will fail with an EIO and this causes the LOGFLUSH commit
-# fail, which in turn means the $SCRATCH_MNT/t_* files do not survive
-# the shutdown, causing generic/635 to fail.  We are not likely going
-# to fix this before we rework ext4's writeback strategy to remove the
-# data=ordered writeback entirely, so let's just exclude this test for
-# now.
+// The generic/635 test tries to call the shutdown ioctl with the
+// LOGFLUSH flag, which unfortunately will does not work well with
+// nodelalloc mount option (which the ext3conv configuration uses).
+// This is because once we are in shutdown state, any attempt to write
+// an inode fails with an EIO --- but this means that the data=ordered
+// writeback will fail with an EIO and this causes the LOGFLUSH commit
+// fail, which in turn means the $SCRATCH_MNT/t_* files do not survive
+// the shutdown, causing generic/635 to fail.  We are not likely going
+// to fix this before we rework ext4's writeback strategy to remove the
+// data=ordered writeback entirely, so let's just exclude this test for
+// now.
 generic/635
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/fast_commit.exclude b/test-appliance/files/root/fs/ext4/cfg/fast_commit.exclude
index 8c13c022..d6eabe50 100644
--- a/test-appliance/files/root/fs/ext4/cfg/fast_commit.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/fast_commit.exclude
@@ -1,6 +1,6 @@
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/fast_commit_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/fast_commit_1k.exclude
index 1252722c..2ad29466 100644
--- a/test-appliance/files/root/fs/ext4/cfg/fast_commit_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/fast_commit_1k.exclude
@@ -1,20 +1,20 @@
-# This test tries to create 65536 directories, and with 1k blocks,
-# and long names, we run out of htree depth
+// This test tries to create 65536 directories, and with 1k blocks,
+// and long names, we run out of htree depth
 ext4/045
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# This test creates too many inodes on when the block size is 1k
-# without using special mkfs.ext4 options to change the inode size.
-# This test is a bit bogus anyway, and uses a bunch of magic calculations
-# where it's not clear what it was originally trying to test in the
-# first place.  So let's just skip it for now.
+// This test creates too many inodes on when the block size is 1k
+// without using special mkfs.ext4 options to change the inode size.
+// This test is a bit bogus anyway, and uses a bunch of magic calculations
+// where it's not clear what it was originally trying to test in the
+// first place.  So let's just skip it for now.
 generic/273
 
-# This test creates too many extended attributes to fit in a 1k block
+// This test creates too many extended attributes to fit in a 1k block
 generic/454
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude b/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude
index 3606f751..e42fd89a 100644
--- a/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude
@@ -1,4 +1,4 @@
-# bigalloc does not support on-line defrag
+// bigalloc does not support on-line defrag
 ext4/301
 ext4/302
 ext4/303
@@ -6,5 +6,5 @@ ext4/304
 ext4/307
 ext4/308
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude b/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude
index 4c93a187..05242ed3 100644
--- a/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude
@@ -1,6 +1,6 @@
-ext4/004	# dump/restore doesn't handle quotas
+ext4/004	// dump/restore doesn't handle quotas
 
-# encryption doesn't play well with quota
+// encryption doesn't play well with quota
 generic/082
 generic/219
 generic/230
@@ -10,10 +10,10 @@ generic/233
 generic/235
 generic/270
 
-# generic/204 tests ENOSPC handling; it doesn't correctly
-# anticipate the external extended attribute required when
-# using a 1k block size
+// generic/204 tests ENOSPC handling; it doesn't correctly
+// anticipate the external extended attribute required when
+// using a 1k block size
 generic/204
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/inline.exclude b/test-appliance/files/root/fs/ext4/cfg/inline.exclude
index b6c802d3..f3aac2db 100644
--- a/test-appliance/files/root/fs/ext4/cfg/inline.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/inline.exclude
@@ -1,8 +1,8 @@
-ext4/004	# dump/restore doesn't handle inline data
+ext4/004	// dump/restore doesn't handle inline data
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/inline_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/inline_1k.exclude
index b6c802d3..f3aac2db 100644
--- a/test-appliance/files/root/fs/ext4/cfg/inline_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/inline_1k.exclude
@@ -1,8 +1,8 @@
-ext4/004	# dump/restore doesn't handle inline data
+ext4/004	// dump/restore doesn't handle inline data
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/largedir.exclude b/test-appliance/files/root/fs/ext4/cfg/largedir.exclude
index 9798febd..942a4b56 100644
--- a/test-appliance/files/root/fs/ext4/cfg/largedir.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/largedir.exclude
@@ -1,4 +1,4 @@
-ext4/004	# dump/restore doesn't handle the large_dir feature
+ext4/004	// dump/restore doesn't handle the large_dir feature
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/logdev.exclude b/test-appliance/files/root/fs/ext4/cfg/logdev.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/ext4/cfg/logdev.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/logdev.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/lustre_mds.exclude b/test-appliance/files/root/fs/ext4/cfg/lustre_mds.exclude
index 8eb6436e..6675c4f3 100644
--- a/test-appliance/files/root/fs/ext4/cfg/lustre_mds.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/lustre_mds.exclude
@@ -1,4 +1,4 @@
-ext4/004	# dump/restore doesn't handle largedir
+ext4/004	// dump/restore doesn't handle largedir
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/nojournal.exclude b/test-appliance/files/root/fs/ext4/cfg/nojournal.exclude
index 9a674ef1..5753409d 100644
--- a/test-appliance/files/root/fs/ext4/cfg/nojournal.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/nojournal.exclude
@@ -1,13 +1,13 @@
-# Without a journal, tests for log state won't pass
+// Without a journal, tests for log state won't pass
 generic/050
 generic/052
 
-# Without a journal, tests which do a shutdown won't pass
+// Without a journal, tests which do a shutdown won't pass
 generic/530
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/orphan_file.exclude b/test-appliance/files/root/fs/ext4/cfg/orphan_file.exclude
index 8c13c022..d6eabe50 100644
--- a/test-appliance/files/root/fs/ext4/cfg/orphan_file.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/orphan_file.exclude
@@ -1,6 +1,6 @@
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/cfg/orphan_file_1k.exclude b/test-appliance/files/root/fs/ext4/cfg/orphan_file_1k.exclude
index 7385d4d7..60263a0b 100644
--- a/test-appliance/files/root/fs/ext4/cfg/orphan_file_1k.exclude
+++ b/test-appliance/files/root/fs/ext4/cfg/orphan_file_1k.exclude
@@ -1,24 +1,24 @@
-# The test fails due to too many block group descriptors when the
-# block size is 1k
+// The test fails due to too many block group descriptors when the
+// block size is 1k
 ext4/033
 
-# This test tries to create 65536 directories, and with 1k blocks,
-# and long names, we run out of htree depth
+// This test tries to create 65536 directories, and with 1k blocks,
+// and long names, we run out of htree depth
 ext4/045
 
-# This takes a *long* time and doesn't add much value to run on all
-# configurations.  So we're going to be selective where we run it.
+// This takes a *long* time and doesn't add much value to run on all
+// configurations.  So we're going to be selective where we run it.
 generic/027
 
-# This test creates too many inodes on when the block size is 1k
-# without using special mkfs.ext4 options to change the inode size.
-# This test is a bit bogus anyway, and uses a bunch of magic calculations
-# where it's not clear what it was originally trying to test in the
-# first place.  So let's just skip it for now.
+// This test creates too many inodes on when the block size is 1k
+// without using special mkfs.ext4 options to change the inode size.
+// This test is a bit bogus anyway, and uses a bunch of magic calculations
+// where it's not clear what it was originally trying to test in the
+// first place.  So let's just skip it for now.
 generic/273
 
-# This test creates too many extended attributes to fit in a 1k block
+// This test creates too many extended attributes to fit in a 1k block
 generic/454
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/ext4/exclude b/test-appliance/files/root/fs/ext4/exclude
index 067671ad..d44b89cf 100644
--- a/test-appliance/files/root/fs/ext4/exclude
+++ b/test-appliance/files/root/fs/ext4/exclude
@@ -1,25 +1,25 @@
-# generic/042 and generic/392 are failing because ext4 forces the
-# resolution of all delayed allocation writes before allowing the
-# punch operation to proceed.  We probably want to see if we can avoid
-# this for the future, but what ext4 is doing is legal, so just skip
-# the test for now
+// generic/042 and generic/392 are failing because ext4 forces the
+// resolution of all delayed allocation writes before allowing the
+// punch operation to proceed.  We probably want to see if we can avoid
+// this for the future, but what ext4 is doing is legal, so just skip
+// the test for now
 generic/042
 generic/392
 
-# generic/04[456] tests how truncate and delayed allocation works
-# ext4 uses the data=ordered to avoid exposing stale data, and
-# so it uses a different mechanism than xfs.  So these tests will fail
+// generic/04[456] tests how truncate and delayed allocation works
+// ext4 uses the data=ordered to avoid exposing stale data, and
+// so it uses a different mechanism than xfs.  So these tests will fail
 generic/044
 generic/045
 generic/046
 
-# generic/223 tests file alignment, which works on ext4 only by
-# accident because we're not RAID stripe aware yet, and works at all
-# because we have bias towards aligning on power-of-two block numbers.
-# It is a flaky test for some configurations, so skip it.
+// generic/223 tests file alignment, which works on ext4 only by
+// accident because we're not RAID stripe aware yet, and works at all
+// because we have bias towards aligning on power-of-two block numbers.
+// It is a flaky test for some configurations, so skip it.
 generic/223
 
-# The shutdown ioctl will sometimes result in a corrupted file systems
-# it really shouldn't, but we probably won't have it fixed for a while.
-# So exclude it for now.
+// The shutdown ioctl will sometimes result in a corrupted file systems
+// it really shouldn't, but we probably won't have it fixed for a while.
+// So exclude it for now.
 generic/388
diff --git a/test-appliance/files/root/fs/f2fs/cfg/default.exclude b/test-appliance/files/root/fs/f2fs/cfg/default.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/f2fs/cfg/default.exclude
+++ b/test-appliance/files/root/fs/f2fs/cfg/default.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/f2fs/cfg/encrypt.exclude b/test-appliance/files/root/fs/f2fs/cfg/encrypt.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/f2fs/cfg/encrypt.exclude
+++ b/test-appliance/files/root/fs/f2fs/cfg/encrypt.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/f2fs/exclude b/test-appliance/files/root/fs/f2fs/exclude
index 799936bf..2fc0241b 100644
--- a/test-appliance/files/root/fs/f2fs/exclude
+++ b/test-appliance/files/root/fs/f2fs/exclude
@@ -1,2 +1,2 @@
-# This test takes over 3 hours to run on f2fs
+// This test takes over 3 hours to run on f2fs
 generic/017
diff --git a/test-appliance/files/root/fs/global_exclude b/test-appliance/files/root/fs/global_exclude
index 53b9a269..3cfdc90c 100644
--- a/test-appliance/files/root/fs/global_exclude
+++ b/test-appliance/files/root/fs/global_exclude
@@ -1,26 +1,26 @@
-# The test generic/471 tests the RWF_NOWAIT flag; however
-# how it is supposed to work with file systems is disputed,
-# and not all device drivers support it.  As a result
-# it doesn't work if an LVM device driver is in use (as is the
-# case with gce-xfstests).  So let's suppress it for now.  For
-# more details see:
-# https://lore.kernel.org/linux-block/20190723220502.GX7777@dread.disaster.area/
+// The test generic/471 tests the RWF_NOWAIT flag; however
+// how it is supposed to work with file systems is disputed,
+// and not all device drivers support it.  As a result
+// it doesn't work if an LVM device driver is in use (as is the
+// case with gce-xfstests).  So let's suppress it for now.  For
+// more details see:
+// https://lore.kernel.org/linux-block/20190723220502.GX7777@dread.disaster.area/
 generic/471
 
-# The proposed fix for generic/484, "locks: change POSIX lock
-# ownership on execve when files_struct is displaced" would break NFS
-# Jeff Layton and Eric Biederman have some ideas for how to address it
-# but fixing it is non-trivial
+// The proposed fix for generic/484, "locks: change POSIX lock
+// ownership on execve when files_struct is displaced" would break NFS
+// Jeff Layton and Eric Biederman have some ideas for how to address it
+// but fixing it is non-trivial
 generic/484
 
-# This test has false positives on all file systems that don't support
-# copy_file_range, since swap files can be read by root, and this
-# test tries to enforce that copy_file_range won't work on swap files.
-# Unfortunately, xfs_io falls back to read/write if necessary, which
-# causes generic/554 to fail.
+// This test has false positives on all file systems that don't support
+// copy_file_range, since swap files can be read by root, and this
+// test tries to enforce that copy_file_range won't work on swap files.
+// Unfortunately, xfs_io falls back to read/write if necessary, which
+// causes generic/554 to fail.
 generic/554
 
-# Richacl was proposed in 2017, and is in SuSE(?) kernels, but it's never
-# gone upstream.   Suppress richacl tests to avoid a large number of
-# "skipped test" noise.
+// Richacl was proposed in 2017, and is in SuSE(?) kernels, but it's never
+// gone upstream.   Suppress richacl tests to avoid a large number of
+// "skipped test" noise.
 -g richacl
diff --git a/test-appliance/files/root/fs/local/exclude b/test-appliance/files/root/fs/local/exclude
index 6d0cbe77..2ee63722 100644
--- a/test-appliance/files/root/fs/local/exclude
+++ b/test-appliance/files/root/fs/local/exclude
@@ -1,4 +1,4 @@
-# These tests fail with an OOM kill, even when run on a system with 8G of RAM
+// These tests fail with an OOM kill, even when run on a system with 8G of RAM
 generic/027
 generic/269
 generic/273
diff --git a/test-appliance/files/root/fs/nfs/cfg/client_v3.exclude b/test-appliance/files/root/fs/nfs/cfg/client_v3.exclude
index 53f51f83..0eb94334 100644
--- a/test-appliance/files/root/fs/nfs/cfg/client_v3.exclude
+++ b/test-appliance/files/root/fs/nfs/cfg/client_v3.exclude
@@ -1,9 +1,9 @@
-# The following tests are listed as expected failures for NFSv3 per
-# https://wiki.linux-nfs.org/wiki/index.php/Xfstests
+// The following tests are listed as expected failures for NFSv3 per
+// https://wiki.linux-nfs.org/wiki/index.php/Xfstests
 generic/099
 generic/258
 generic/375
 generic/444
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/nfs/cfg/client_v4.exclude b/test-appliance/files/root/fs/nfs/cfg/client_v4.exclude
index 8aacde92..5d2229b4 100644
--- a/test-appliance/files/root/fs/nfs/cfg/client_v4.exclude
+++ b/test-appliance/files/root/fs/nfs/cfg/client_v4.exclude
@@ -1,6 +1,6 @@
-# The following test is listed as expected failures for NFSv4 per
-# https://wiki.linux-nfs.org/wiki/index.php/Xfstests
+// The following test is listed as expected failures for NFSv4 per
+// https://wiki.linux-nfs.org/wiki/index.php/Xfstests
 generic/426
 
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/nfs/exclude b/test-appliance/files/root/fs/nfs/exclude
index 5dae4767..184750fb 100644
--- a/test-appliance/files/root/fs/nfs/exclude
+++ b/test-appliance/files/root/fs/nfs/exclude
@@ -1,12 +1,12 @@
-# The following tests are listed as expected failures for NFSv3 and NFSv4 per
-# https://wiki.linux-nfs.org/wiki/index.php/Xfstests
+// The following tests are listed as expected failures for NFSv3 and NFSv4 per
+// https://wiki.linux-nfs.org/wiki/index.php/Xfstests
 generic/035
 generic/423
 generic/465
 generic/467
 generic/477
 
-# This test is not listed as an expected failure, but it shows up as
-# failing in the expected output of the linux-nfs Wiki page.  So we'll
-# suppress this failure for now.
+// This test is not listed as an expected failure, but it shows up as
+// failing in the expected output of the linux-nfs Wiki page.  So we'll
+// suppress this failure for now.
 generic/294
diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude b/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude
index d7935b69..a3147783 100644
--- a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude
+++ b/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude
@@ -1 +1 @@
-overlay/001	# requires (2*4G + 8k) free space on $SCRATCH_DEV.
+overlay/001	// requires (2*4G + 8k) free space on $SCRATCH_DEV.
diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude b/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
index d7935b69..a3147783 100644
--- a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
+++ b/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
@@ -1 +1 @@
-overlay/001	# requires (2*4G + 8k) free space on $SCRATCH_DEV.
+overlay/001	// requires (2*4G + 8k) free space on $SCRATCH_DEV.
diff --git a/test-appliance/files/root/fs/overlay/cfg/small.exclude b/test-appliance/files/root/fs/overlay/cfg/small.exclude
index d7935b69..a3147783 100644
--- a/test-appliance/files/root/fs/overlay/cfg/small.exclude
+++ b/test-appliance/files/root/fs/overlay/cfg/small.exclude
@@ -1 +1 @@
-overlay/001	# requires (2*4G + 8k) free space on $SCRATCH_DEV.
+overlay/001	// requires (2*4G + 8k) free space on $SCRATCH_DEV.
diff --git a/test-appliance/files/root/fs/overlay/exclude b/test-appliance/files/root/fs/overlay/exclude
index 1a76efdf..30a8d08d 100644
--- a/test-appliance/files/root/fs/overlay/exclude
+++ b/test-appliance/files/root/fs/overlay/exclude
@@ -1,3 +1,3 @@
-# causing timeouts and occasionally OOM killed
+// causing timeouts and occasionally OOM killed
 generic/551
 generic/623
diff --git a/test-appliance/files/root/fs/reiserfs/exclude b/test-appliance/files/root/fs/reiserfs/exclude
index 2f92ce54..5b4bd62e 100644
--- a/test-appliance/files/root/fs/reiserfs/exclude
+++ b/test-appliance/files/root/fs/reiserfs/exclude
@@ -1,14 +1,14 @@
-# This tests causes reiserfs to deadlock; it appears to be related to
-# FITHAW; possibly a deadlock involving s_umount and the inode_lock
-# when modifying xattrs.
+// This tests causes reiserfs to deadlock; it appears to be related to
+// FITHAW; possibly a deadlock involving s_umount and the inode_lock
+// when modifying xattrs.
 generic/068
 
-# This test causes reiserfs to deadlock; it may be related to a
-# deadlock between reiserfs's sbi->lock and the inode_lock in
-# open_xa_dir().
+// This test causes reiserfs to deadlock; it may be related to a
+// deadlock between reiserfs's sbi->lock and the inode_lock in
+// open_xa_dir().
 generic/083
 
-# These tests are also subject to deadlocks in reiserfs
+// These tests are also subject to deadlocks in reiserfs
 generic/233
 generic/269
 generic/270
diff --git a/test-appliance/files/root/fs/tmpfs/exclude b/test-appliance/files/root/fs/tmpfs/exclude
index 6d0cbe77..2ee63722 100644
--- a/test-appliance/files/root/fs/tmpfs/exclude
+++ b/test-appliance/files/root/fs/tmpfs/exclude
@@ -1,4 +1,4 @@
-# These tests fail with an OOM kill, even when run on a system with 8G of RAM
+// These tests fail with an OOM kill, even when run on a system with 8G of RAM
 generic/027
 generic/269
 generic/273
diff --git a/test-appliance/files/root/fs/xfs/cfg/1k.exclude b/test-appliance/files/root/fs/xfs/cfg/1k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/1k.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/1k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/4k.exclude b/test-appliance/files/root/fs/xfs/cfg/4k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/4k.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/4k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/64k.exclude b/test-appliance/files/root/fs/xfs/cfg/64k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/64k.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/64k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/adv.exclude b/test-appliance/files/root/fs/xfs/cfg/adv.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/adv.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/adv.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/dax.exclude b/test-appliance/files/root/fs/xfs/cfg/dax.exclude
index f6cc4a56..a6771d78 100644
--- a/test-appliance/files/root/fs/xfs/cfg/dax.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/dax.exclude
@@ -1,12 +1,12 @@
-# These tests format the scratch file system using the default
-# mkfs.xfs options which now includes reflink, and reflink is not
-# compatible with DAX
+// These tests format the scratch file system using the default
+// mkfs.xfs options which now includes reflink, and reflink is not
+// compatible with DAX
 xfs/032
 xfs/205
 xfs/294
 
-# This test formats a file system with a 1k block size, which is not
-# compatible with DAX (at least with systems with a 4k page size).
+// This test formats a file system with a 1k block size, which is not
+// compatible with DAX (at least with systems with a 4k page size).
 xfs/432
 
 
diff --git a/test-appliance/files/root/fs/xfs/cfg/dirblock_8k.exclude b/test-appliance/files/root/fs/xfs/cfg/dirblock_8k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/dirblock_8k.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/dirblock_8k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/logdev.exclude b/test-appliance/files/root/fs/xfs/cfg/logdev.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/logdev.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/logdev.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/quota.exclude b/test-appliance/files/root/fs/xfs/cfg/quota.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/quota.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/quota.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/quota_1k.exclude b/test-appliance/files/root/fs/xfs/cfg/quota_1k.exclude
index a9acba9c..44253a20 100644
--- a/test-appliance/files/root/fs/xfs/cfg/quota_1k.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/quota_1k.exclude
@@ -1,2 +1,2 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
diff --git a/test-appliance/files/root/fs/xfs/cfg/realtime.exclude b/test-appliance/files/root/fs/xfs/cfg/realtime.exclude
index bafce552..a0feb426 100644
--- a/test-appliance/files/root/fs/xfs/cfg/realtime.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/realtime.exclude
@@ -1,7 +1,7 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
 
-# The xfs/076 test takes well over an hour (80 minutes using 100GB GCE
-# PD/SSD) when run with an external realtime device, which triggers
-# the ltm "test is stalled" failsafe which aborts the VM.
+// The xfs/076 test takes well over an hour (80 minutes using 100GB GCE
+// PD/SSD) when run with an external realtime device, which triggers
+// the ltm "test is stalled" failsafe which aborts the VM.
 xfs/076
diff --git a/test-appliance/files/root/fs/xfs/cfg/realtime_28k_logdev.exclude b/test-appliance/files/root/fs/xfs/cfg/realtime_28k_logdev.exclude
index bafce552..a0feb426 100644
--- a/test-appliance/files/root/fs/xfs/cfg/realtime_28k_logdev.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/realtime_28k_logdev.exclude
@@ -1,7 +1,7 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
 
-# The xfs/076 test takes well over an hour (80 minutes using 100GB GCE
-# PD/SSD) when run with an external realtime device, which triggers
-# the ltm "test is stalled" failsafe which aborts the VM.
+// The xfs/076 test takes well over an hour (80 minutes using 100GB GCE
+// PD/SSD) when run with an external realtime device, which triggers
+// the ltm "test is stalled" failsafe which aborts the VM.
 xfs/076
diff --git a/test-appliance/files/root/fs/xfs/cfg/realtime_logdev.exclude b/test-appliance/files/root/fs/xfs/cfg/realtime_logdev.exclude
index bafce552..a0feb426 100644
--- a/test-appliance/files/root/fs/xfs/cfg/realtime_logdev.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/realtime_logdev.exclude
@@ -1,7 +1,7 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
 
-# The xfs/076 test takes well over an hour (80 minutes using 100GB GCE
-# PD/SSD) when run with an external realtime device, which triggers
-# the ltm "test is stalled" failsafe which aborts the VM.
+// The xfs/076 test takes well over an hour (80 minutes using 100GB GCE
+// PD/SSD) when run with an external realtime device, which triggers
+// the ltm "test is stalled" failsafe which aborts the VM.
 xfs/076
diff --git a/test-appliance/files/root/fs/xfs/cfg/v4.exclude b/test-appliance/files/root/fs/xfs/cfg/v4.exclude
index 83ccfd79..41de4e22 100644
--- a/test-appliance/files/root/fs/xfs/cfg/v4.exclude
+++ b/test-appliance/files/root/fs/xfs/cfg/v4.exclude
@@ -1,16 +1,16 @@
-# Normal configurations don't support dax
+// Normal configurations don't support dax
 -g dax
 
-# On a 5.15-rc4 kernel, xfs/170 reliably causes a soft lockup in
-# xfs_alloc_read_agf()+0x41/0x110.  Call stack:
-#
-# xfs_alloc_pagf_init+0x27/0x60
-# xfs_filestream_pick_ag+0x280/0x530
-# xfs_filestream_new_ag+0x87/0x100
-# xfs_bmap_btalloc_filestreams.constprop.0+0xe0/0x120
-# xfs_bmap_btalloc+0x3e6/0x700
-# xfs_bmapi_allocate+0xe4/0x310
-# xfs_bmapi_convert_delalloc+0x26c/0x480
-# xfs_map_blocks+0x1b5/0x510
-# ...
+// On a 5.15-rc4 kernel, xfs/170 reliably causes a soft lockup in
+// xfs_alloc_read_agf()+0x41/0x110.  Call stack:
+//
+// xfs_alloc_pagf_init+0x27/0x60
+// xfs_filestream_pick_ag+0x280/0x530
+// xfs_filestream_new_ag+0x87/0x100
+// xfs_bmap_btalloc_filestreams.constprop.0+0xe0/0x120
+// xfs_bmap_btalloc+0x3e6/0x700
+// xfs_bmapi_allocate+0xe4/0x310
+// xfs_bmapi_convert_delalloc+0x26c/0x480
+// xfs_map_blocks+0x1b5/0x510
+// ...
 xfs/170
diff --git a/test-appliance/files/root/fs/xfs/exclude b/test-appliance/files/root/fs/xfs/exclude
index 7d32d181..b20e207e 100644
--- a/test-appliance/files/root/fs/xfs/exclude
+++ b/test-appliance/files/root/fs/xfs/exclude
@@ -1,4 +1,4 @@
-# Consistently failing in 5.17.2 and 5.15.33, however, surprisingy not
-# failing in 5.15.33 with potential backports
+// Consistently failing in 5.17.2 and 5.15.33, however, surprisingy not
+// failing in 5.15.33 with potential backports
 xfs/540
 
diff --git a/test-appliance/files/root/runtests.sh b/test-appliance/files/root/runtests.sh
index dcf5d109..6c01bb1f 100755
--- a/test-appliance/files/root/runtests.sh
+++ b/test-appliance/files/root/runtests.sh
@@ -471,23 +471,18 @@ do
 	export FSTYP=$FS
 	AEX=""
 	if test -n "$DO_AEX" ; then
-	    if test -f "/root/fs/global_exclude" ; then
-		sed -e 's/#.*//' -e 's/[ \t]*$//' -e '/^$/d' \
-		    < "/root/fs/global_exclude" > "/tmp/exclude"
+	    files=()
+	    for i in "/root/fs/global_exclude" \
+			"/root/fs/$FS/exclude" \
+			"/root/fs/$FS/cfg/$TC.exclude" \
+			"/root/fs/exclude.$XFSTESTS_FLAVOR" ; do
+		test -f "$i" && files+=("$i")
+	    done
+	    if [ ${#files[@]} -ge 0 ]; then
+		sed -e 's;//.*;;' -e 's/[ \t]*$//' -e '/^$/d' \
+		    ${files[@]} > /tmp/exclude
 	    else
-		cp /dev/null "/tmp/exclude"
-	    fi
-	    if test -f "/root/fs/$FS/exclude" ; then
-		sed -e 's/#.*//' -e 's/[ \t]*$//' -e '/^$/d' \
-		    < "/root/fs/$FS/exclude" >> "/tmp/exclude"
-	    fi
-	    if test -f "/root/fs/$FS/cfg/$TC.exclude"; then
-		sed -e 's/#.*//' -e 's/[ \t]*$//' -e '/^$/d' \
-		    < "/root/fs/$FS/cfg/$TC.exclude" >> "/tmp/exclude"
-	    fi
-	    if test -f "/root/fs/exclude.$XFSTESTS_FLAVOR" ; then
-		sed -e 's/#.*//' -e 's/[ \t]*$//' -e '/^$/d' \
-		    < "/root/fs/exclude.$XFSTESTS_FLAVOR" >> "/tmp/exclude"
+		cp /dev/null /tmp/exclude
 	    fi
 	    if test -s "/tmp/exclude" ; then
 		EXSET=$(sort -u "/tmp/exclude")