Mount tmpfs first to ensure overlayfs works consistently.

tests/overlay-local-store/common.sh

@@ -13,26 +13,29 @@ setupConfig () {
 }
 
 storeDirs () {
-  storeA="$TEST_ROOT/store-a"
+  storesRoot="$TEST_ROOT/stores"
-  storeBTop="$TEST_ROOT/store-b"
+  mkdir -p "$storesRoot"
-  storeB="local-overlay?root=$TEST_ROOT/merged-store&lower-store=$storeA&upper-layer=$storeBTop"
+  mount -t tmpfs tmpfs "$storesRoot"
+  storeA="$storesRoot/store-a"
+  storeBTop="$storesRoot/store-b"
+  storeB="local-overlay?root=$storesRoot/merged-store&lower-store=$storeA&upper-layer=$storeBTop"
   # Creating testing directories
-  mkdir -p "$TEST_ROOT"/{store-a/nix/store,store-b,merged-store/nix/store,workdir}
+  mkdir -p "$storesRoot"/{store-a/nix/store,store-b,merged-store/nix/store,workdir}
 }
 
 # Mounting Overlay Store
 mountOverlayfs () {
-  mergedStorePath="$TEST_ROOT/merged-store/nix/store"
+  mergedStorePath="$storesRoot/merged-store/nix/store"
   mount -t overlay overlay \
     -o lowerdir="$storeA/nix/store" \
     -o upperdir="$storeBTop" \
-    -o workdir="$TEST_ROOT/workdir" \
+    -o workdir="$storesRoot/workdir" \
     "$mergedStorePath" \
     || skipTest "overlayfs is not supported"
 
   cleanupOverlay () {
-    umount "$TEST_ROOT/merged-store/nix/store"
+    umount "$storesRoot/merged-store/nix/store"
-    rm -r $TEST_ROOT/workdir
+    rm -r $storesRoot/workdir
   }
   trap cleanupOverlay EXIT
 }

tests/overlay-local-store/optimise-inner.sh

@@ -17,7 +17,7 @@ initLowerStore
 mountOverlayfs
 
 # Create a file to add to store
-dupFilePath="$TEST_ROOT/dup-file"
+dupFilePath="$storesRoot/dup-file"
 echo Duplicate > "$dupFilePath"
 
 # Add it to the overlay store (it will be written to the upper layer)