--- a/tests/test-contrib-perf.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-contrib-perf.t	Fri Feb 21 22:23:46 2025 -0500
@@ -251,7 +251,6 @@
   $ hg perfdirstatedirs
   $ hg perfdirstatefoldmap
   $ hg perfdirstatewrite
-#if repofncache
   $ hg perffncacheencode
   $ hg perffncacheload
   $ hg debugrebuildfncache
@@ -259,7 +258,6 @@
   $ hg perffncachewrite
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ hg perfheads
   $ hg perfignore
   $ hg perfindex

--- a/tests/test-convert.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-convert.t	Fri Feb 21 22:23:46 2025 -0500
@@ -532,11 +532,9 @@
 
 contents of fncache file:
 
-#if repofncache
   $ cat b/.hg/store/fncache | sort
   data/a.i
   data/b.i
-#endif
 
 test bogus URL
 

--- a/tests/test-fncache.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-fncache.t	Fri Feb 21 22:23:46 2025 -0500
@@ -1,5 +1,3 @@
-#require repofncache
-
 An extension which will set fncache chunksize to 1 byte to make sure that logic
 does not break
 

--- a/tests/test-hardlinks.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-hardlinks.t	Fri Feb 21 22:23:46 2025 -0500
@@ -51,12 +51,12 @@
   1 r1/.hg/store/00manifest.i
   1 r1/.hg/store/data/d1/f2.i
   1 r1/.hg/store/data/f1.i
-  1 r1/.hg/store/fncache (repofncache !)
+  1 r1/.hg/store/fncache
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
-  1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
+  1 r1/.hg/store/undo.backup.fncache.bck
   1 r1/.hg/store/undo.backupfiles
 
 
@@ -108,12 +108,12 @@
   2 r1/.hg/store/00manifest.i
   2 r1/.hg/store/data/d1/f2.i
   2 r1/.hg/store/data/f1.i
-  1 r1/.hg/store/fncache (repofncache !)
+  1 r1/.hg/store/fncache
   1 r1/.hg/store/phaseroots
   1 r1/.hg/store/requires
   1 r1/.hg/store/undo
   1 r1/.hg/store/undo.backup.00changelog.n.bck (rust !)
-  1 r1/.hg/store/undo.backup.fncache.bck (repofncache !)
+  1 r1/.hg/store/undo.backup.fncache.bck
   1 r1/.hg/store/undo.backupfiles
 
   $ nlinksdir r2/.hg/store
@@ -124,7 +124,7 @@
   2 r2/.hg/store/00manifest.i
   2 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
-  1 r2/.hg/store/fncache (repofncache !)
+  1 r2/.hg/store/fncache
   1 r2/.hg/store/requires
 
 Repo r3 should not be hardlinked:
@@ -137,7 +137,7 @@
   1 r3/.hg/store/00manifest.i
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
-  1 r3/.hg/store/fncache (repofncache !)
+  1 r3/.hg/store/fncache
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/requires
   1 r3/.hg/store/undo
@@ -166,7 +166,7 @@
   1 r3/.hg/store/data/d1/f2.d
   1 r3/.hg/store/data/d1/f2.i
   1 r3/.hg/store/data/f1.i
-  1 r3/.hg/store/fncache (repofncache !)
+  1 r3/.hg/store/fncache
   1 r3/.hg/store/phaseroots
   1 r3/.hg/store/requires
   1 r3/.hg/store/undo
@@ -196,10 +196,10 @@
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   2 r2/.hg/store/data/f1.i
-  [12] r2/\.hg/store/fncache (re) (repofncache !)
+  [12] r2/\.hg/store/fncache (re)
   1 r2/.hg/store/requires
 
-#if hardlink-whitelisted repofncache
+#if hardlink-whitelisted
   $ nlinksdir r2/.hg/store/fncache
   1 r2/.hg/store/fncache
 #endif
@@ -224,10 +224,10 @@
   1 r2/.hg/store/00manifest.i
   1 r2/.hg/store/data/d1/f2.i
   1 r2/.hg/store/data/f1.i
-  1 r2/.hg/store/fncache (repofncache !)
+  1 r2/.hg/store/fncache
   1 r2/.hg/store/requires
 
-#if hardlink-whitelisted repofncache
+#if hardlink-whitelisted
   $ nlinksdir r2/.hg/store/fncache
   1 r2/.hg/store/fncache
 #endif
@@ -282,7 +282,7 @@
   2 r4/.hg/store/data/d1/f2.i
   2 r4/.hg/store/data/f1.i
   2 r4/.hg/store/data/f3.i
-  2 r4/.hg/store/fncache (repofncache !)
+  2 r4/.hg/store/fncache
   2 r4/.hg/store/phaseroots
   2 r4/.hg/store/requires
   2 r4/.hg/store/undo

--- a/tests/test-inherit-mode.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-inherit-mode.t	Fri Feb 21 22:23:46 2025 -0500
@@ -87,7 +87,7 @@
   00770 ./.hg/store/data/dir/
   00660 ./.hg/store/data/dir/bar.i
   00660 ./.hg/store/data/foo.i
-  00660 ./.hg/store/fncache (repofncache !)
+  00660 ./.hg/store/fncache
   00660 ./.hg/store/phaseroots
   00600 ./.hg/store/requires
   00660 ./.hg/store/undo
@@ -143,7 +143,7 @@
   00770 ../push/.hg/store/data/dir/
   00660 ../push/.hg/store/data/dir/bar.i
   00660 ../push/.hg/store/data/foo.i
-  00660 ../push/.hg/store/fncache (repofncache !)
+  00660 ../push/.hg/store/fncache
   00660 ../push/.hg/store/requires
   00660 ../push/.hg/store/undo
   00660 ../push/.hg/store/undo.backupfiles

--- a/tests/test-narrow.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-narrow.t	Fri Feb 21 22:23:46 2025 -0500
@@ -341,10 +341,8 @@
   I path:d0
   I path:d3
   I path:d9
-#if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ find *
   d0
   d0/f
@@ -364,10 +362,8 @@
   I path:d3
   I path:d9
   X path:d3/f
-#if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ find *
   d0
   d0/f
@@ -386,10 +382,8 @@
   I path:d9
   X path:d0
   X path:d3/f
-#if repofncache
   $ hg debugrebuildfncache
   fncache already up to date
-#endif
   $ find *
   d9
   d9/f

--- a/tests/test-strip.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-strip.t	Fri Feb 21 22:23:46 2025 -0500
@@ -492,19 +492,15 @@
 
   $ touch a
   $ hg ci -qAm a
-#if repofncache
   $ cat .hg/store/fncache | sort
   data/a.i
   data/bar.i
-#endif
 
   $ hg strip tip
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
-#if repofncache
   $ cat .hg/store/fncache
   data/bar.i
-#endif
 
 stripping an empty revset
 

--- a/tests/test-treemanifest.t	Fri Feb 21 22:20:39 2025 -0500
+++ b/tests/test-treemanifest.t	Fri Feb 21 22:23:46 2025 -0500
@@ -539,7 +539,6 @@
 Verify works
   $ hg verify -q
 
-#if repofncache
 Dirlogs are included in fncache
   $ grep meta/.A/00manifest.i .hg/store/fncache
   meta/.A/00manifest.i
@@ -564,7 +563,6 @@
   adding meta/b/foo/apple/00manifest.i
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache
-#endif
 
 Finish first server
   $ killdaemons.py