fix: flake trycmd bug

Signed-off-by: Christina Sørensen <christina@cafkafk.com>

Cargo.lock

@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aho-corasick"
 version = "1.0.5"
@@ -115,6 +130,21 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "backtrace"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -411,6 +441,7 @@ name = "eza"
 version = "0.19.4"
 dependencies = [
  "ansi-width",
+ "backtrace",
  "chrono",
  "criterion",
  "dirs",
@@ -487,6 +518,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+
 [[package]]
 name = "git2"
 version = "0.19.0"
@@ -713,6 +750,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "natord"
 version = "1.0.9"
@@ -756,6 +802,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
+[[package]]
+name = "object"
+version = "0.36.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -1080,6 +1135,12 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
 [[package]]
 name = "rustix"
 version = "0.38.21"
@@ -1160,9 +1221,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -1187,9 +1248,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "snapbox"
-version = "0.5.12"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15d55fd1f4a2ee1767db08ba740916a0f3a8e9add2947f19700a99ebcb119af0"
+checksum = "840b73eb3148bc3cbc10ebe00ec9bc6d96033e658d022c4adcbf3f35596fd64a"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1204,14 +1265,14 @@ dependencies = [
  "tempfile",
  "wait-timeout",
  "walkdir",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "snapbox-macros"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
+checksum = "16569f53ca23a41bb6f62e0a5084aa1661f4814a67fa33696a79073e03a664af"
 dependencies = [
  "anstream",
 ]
@@ -1334,18 +1395,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
@@ -1356,10 +1417,11 @@ dependencies = [
 
 [[package]]
 name = "trycmd"
-version = "0.15.2"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29622709ff54daef580ca6fff0687368527662c9e36fa8907438af35eb334b19"
+checksum = "288c25d9be00f5ac52a3b3ff7720248c223096534ec34e870188f1bc93f2465c"
 dependencies = [
+ "anstream",
  "automod",
  "glob",
  "humantime",
@@ -1729,9 +1791,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]

Cargo.toml

@@ -100,6 +100,7 @@ ansi-width = "0.1.0"
 serde = { version = "1.0.193", features = ["derive"] }
 dirs = "5.0.1"
 serde_norway = "0.9"
+backtrace = "0.3"
 
 [dependencies.git2]
 version = "0.19"

devtools/generate-trycmd-test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Generate test data for the program
 

flake.nix

@@ -215,7 +215,7 @@
           };
 
           # Run `nix build .#trydump` to dump testing files
-          trydump = naersk'.buildPackage {
+          trydump = naersk'.buildPackage rec {
             src = ./.;
             mode = "test";
             doCheck = true;
@@ -242,13 +242,20 @@
                 "--features nix"
                 "--features nix-local"
                 "--features powertest"
+                #"-F trycmd/debug"
               ];
             TRYCMD = "dump";
             postInstall = ''
+              fd -e stdout -e stderr -H -t file -X sed -i 's/\/build\/source\//[CWD]\//g'
+
               cp dump $out -r
             '';
             inherit buildInputs;
-            nativeBuildInputs = with pkgs; [ git ];
+            nativeBuildInputs = with pkgs; [
+              fd
+              gnused
+              git
+            ];
           };
         };
 

justfile

@@ -273,6 +273,5 @@ gen_test_dir:
 
     find result/dump -type f \( -name "*.stdout" -o -name "*.stderr" \) -exec sh -c 'base=$(basename {}); if [ -e "tests/gen/${base%.*}.toml" ]; then cp {} tests/gen/; elif [ -e "tests/cmd/${base%.*}.toml" ]; then cp {} tests/cmd/; elif [ -e "tests/ptests/${base%.*}.toml" ]; then cp {} tests/ptests/; fi' \;
 
-
 @itest-gen:
     nix build -L ./#trycmd

tests/cmd/absolute_recurse_unix.stdout

@@ -1,50 +1,50 @@
-/build/source/tests/itest/a
-/build/source/tests/itest/b
-/build/source/tests/itest/c
-/build/source/tests/itest/d
-/build/source/tests/itest/dir-symlink -> vagrant/debug
-/build/source/tests/itest/e
-/build/source/tests/itest/exa
-/build/source/tests/itest/f
-/build/source/tests/itest/g
-/build/source/tests/itest/h
-/build/source/tests/itest/i
-/build/source/tests/itest/image.jpg.img.c.rs.log.png
-/build/source/tests/itest/index.svg
-/build/source/tests/itest/j
-/build/source/tests/itest/k
-/build/source/tests/itest/l
-/build/source/tests/itest/m
-/build/source/tests/itest/n
-/build/source/tests/itest/o
-/build/source/tests/itest/p
-/build/source/tests/itest/q
-/build/source/tests/itest/vagrant
+[CWD]/tests/itest/a
+[CWD]/tests/itest/b
+[CWD]/tests/itest/c
+[CWD]/tests/itest/d
+[CWD]/tests/itest/dir-symlink -> vagrant/debug
+[CWD]/tests/itest/e
+[CWD]/tests/itest/exa
+[CWD]/tests/itest/f
+[CWD]/tests/itest/g
+[CWD]/tests/itest/h
+[CWD]/tests/itest/i
+[CWD]/tests/itest/image.jpg.img.c.rs.log.png
+[CWD]/tests/itest/index.svg
+[CWD]/tests/itest/j
+[CWD]/tests/itest/k
+[CWD]/tests/itest/l
+[CWD]/tests/itest/m
+[CWD]/tests/itest/n
+[CWD]/tests/itest/o
+[CWD]/tests/itest/p
+[CWD]/tests/itest/q
+[CWD]/tests/itest/vagrant
 
 tests/itest/exa:
-/build/source/tests/itest/exa/file.c -> djihisudjuhfius
-/build/source/tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+[CWD]/tests/itest/exa/file.c -> djihisudjuhfius
+[CWD]/tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
 
 tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss:
-/build/source/tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss/Makefile
+[CWD]/tests/itest/exa/sssssssssssssssssssssssssggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss/Makefile
 
 tests/itest/vagrant:
-/build/source/tests/itest/vagrant/debug
-/build/source/tests/itest/vagrant/dev
-/build/source/tests/itest/vagrant/log
+[CWD]/tests/itest/vagrant/debug
+[CWD]/tests/itest/vagrant/dev
+[CWD]/tests/itest/vagrant/log
 
 tests/itest/vagrant/debug:
-/build/source/tests/itest/vagrant/debug/a
-/build/source/tests/itest/vagrant/debug/symlink -> a
-/build/source/tests/itest/vagrant/debug/symlink-broken -> ./b
+[CWD]/tests/itest/vagrant/debug/a
+[CWD]/tests/itest/vagrant/debug/symlink -> a
+[CWD]/tests/itest/vagrant/debug/symlink-broken -> ./b
 
 tests/itest/vagrant/dev:
-/build/source/tests/itest/vagrant/dev/main.bf
+[CWD]/tests/itest/vagrant/dev/main.bf
 
 tests/itest/vagrant/log:
-/build/source/tests/itest/vagrant/log/file.png
-/build/source/tests/itest/vagrant/log/run
+[CWD]/tests/itest/vagrant/log/file.png
+[CWD]/tests/itest/vagrant/log/run
 
 tests/itest/vagrant/log/run:
-/build/source/tests/itest/vagrant/log/run/run.log.text
-/build/source/tests/itest/vagrant/log/run/sps.log.text
+[CWD]/tests/itest/vagrant/log/run/run.log.text
+[CWD]/tests/itest/vagrant/log/run/sps.log.text

tests/cmd/absolute_unix.stdout

@@ -1,22 +1,22 @@
-/build/source/tests/itest/a
-/build/source/tests/itest/b
-/build/source/tests/itest/c
-/build/source/tests/itest/d
-/build/source/tests/itest/dir-symlink -> vagrant/debug
-/build/source/tests/itest/e
-/build/source/tests/itest/exa
-/build/source/tests/itest/f
-/build/source/tests/itest/g
-/build/source/tests/itest/h
-/build/source/tests/itest/i
-/build/source/tests/itest/image.jpg.img.c.rs.log.png
-/build/source/tests/itest/index.svg
-/build/source/tests/itest/j
-/build/source/tests/itest/k
-/build/source/tests/itest/l
-/build/source/tests/itest/m
-/build/source/tests/itest/n
-/build/source/tests/itest/o
-/build/source/tests/itest/p
-/build/source/tests/itest/q
-/build/source/tests/itest/vagrant
+[CWD]/tests/itest/a
+[CWD]/tests/itest/b
+[CWD]/tests/itest/c
+[CWD]/tests/itest/d
+[CWD]/tests/itest/dir-symlink -> vagrant/debug
+[CWD]/tests/itest/e
+[CWD]/tests/itest/exa
+[CWD]/tests/itest/f
+[CWD]/tests/itest/g
+[CWD]/tests/itest/h
+[CWD]/tests/itest/i
+[CWD]/tests/itest/image.jpg.img.c.rs.log.png
+[CWD]/tests/itest/index.svg
+[CWD]/tests/itest/j
+[CWD]/tests/itest/k
+[CWD]/tests/itest/l
+[CWD]/tests/itest/m
+[CWD]/tests/itest/n
+[CWD]/tests/itest/o
+[CWD]/tests/itest/p
+[CWD]/tests/itest/q
+[CWD]/tests/itest/vagrant

tests/ptests/ptest_10c50228fc1c6107.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_132ac9f159c3473e.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_1ab8279d631495b0.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_1e61d8c305ff6c48.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_469e79a86c2c874f.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_4b30f7de50929327.stdout

@@ -1,9 +1,9 @@
-/build/source/tests/test_dir/git
-/build/source/tests/test_dir/grid
-/build/source/tests/test_dir/group
-/build/source/tests/test_dir/icons
-/build/source/tests/test_dir/perms
-/build/source/tests/test_dir/size
-/build/source/tests/test_dir/specials
-/build/source/tests/test_dir/symlinks
-/build/source/tests/test_dir/time
+[CWD]/tests/test_dir/git
+[CWD]/tests/test_dir/grid
+[CWD]/tests/test_dir/group
+[CWD]/tests/test_dir/icons
+[CWD]/tests/test_dir/perms
+[CWD]/tests/test_dir/size
+[CWD]/tests/test_dir/specials
+[CWD]/tests/test_dir/symlinks
+[CWD]/tests/test_dir/time

tests/ptests/ptest_6e6893c2c2254622.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_7d1cd636566df8cd.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_825e60e73630f857.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_8484317bd3add4dc.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_8becd3030ba5621c.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_8cd9b0ae2930d704.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 git
+drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 grid
+drwxr-xr-x - nixbld  1 Jan  1970 git
 drwxr-xr-x - nixbld  1 Jan  1970 size
 drwxr-xr-x - nixbld  1 Jan  1970 icons
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 specials
-drwxr-xr-x - nixbld  1 Jan  1970 time
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks

tests/ptests/ptest_8ece6263396deeab.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_a689ab7558716dda.stdout

@@ -1,9 +1,9 @@
-]8;;file:///build/source/tests/test_dir/git/git]8;;/
-]8;;file:///build/source/tests/test_dir/grid/grid]8;;/
-]8;;file:///build/source/tests/test_dir/group/group]8;;/
-]8;;file:///build/source/tests/test_dir/icons/icons]8;;/
-]8;;file:///build/source/tests/test_dir/perms/perms]8;;/
-]8;;file:///build/source/tests/test_dir/size/size]8;;/
-]8;;file:///build/source/tests/test_dir/specials/specials]8;;/
-]8;;file:///build/source/tests/test_dir/symlinks/symlinks]8;;/
-]8;;file:///build/source/tests/test_dir/time/time]8;;/
+]8;;file://[CWD]/tests/test_dir/git/git]8;;/
+]8;;file://[CWD]/tests/test_dir/grid/grid]8;;/
+]8;;file://[CWD]/tests/test_dir/group/group]8;;/
+]8;;file://[CWD]/tests/test_dir/icons/icons]8;;/
+]8;;file://[CWD]/tests/test_dir/perms/perms]8;;/
+]8;;file://[CWD]/tests/test_dir/size/size]8;;/
+]8;;file://[CWD]/tests/test_dir/specials/specials]8;;/
+]8;;file://[CWD]/tests/test_dir/symlinks/symlinks]8;;/
+]8;;file://[CWD]/tests/test_dir/time/time]8;;/

tests/ptests/ptest_abc83ec759ddab6.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_bbfc26a93fbe15a7.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_bc3ef3722b915c0a.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 git
+drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 grid
+drwxr-xr-x - nixbld  1 Jan  1970 git
 drwxr-xr-x - nixbld  1 Jan  1970 size
 drwxr-xr-x - nixbld  1 Jan  1970 icons
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 specials
-drwxr-xr-x - nixbld  1 Jan  1970 time
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks

tests/ptests/ptest_caa4e824b02fa569.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_cc209e82fa5f78eb.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_cee646e8f21997ad.stdout

@@ -1,9 +1,9 @@
-drwxr-xr-x - nixbld  1 Jan  1970 perms
-drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 symlinks
 drwxr-xr-x - nixbld  1 Jan  1970 time
+drwxr-xr-x - nixbld  1 Jan  1970 size
+drwxr-xr-x - nixbld  1 Jan  1970 group
 drwxr-xr-x - nixbld  1 Jan  1970 icons
 drwxr-xr-x - nixbld  1 Jan  1970 grid
-drwxr-xr-x - nixbld  1 Jan  1970 group
-drwxr-xr-x - nixbld  1 Jan  1970 symlinks
-drwxr-xr-x - nixbld  1 Jan  1970 specials
+drwxr-xr-x - nixbld  1 Jan  1970 perms
 drwxr-xr-x - nixbld  1 Jan  1970 git

tests/ptests/ptest_f90d48e69d70b41.stdout

@@ -1,9 +1,9 @@
-/build/source/tests/test_dir/git
-/build/source/tests/test_dir/grid
-/build/source/tests/test_dir/group
-/build/source/tests/test_dir/icons
-/build/source/tests/test_dir/perms
-/build/source/tests/test_dir/size
-/build/source/tests/test_dir/specials
-/build/source/tests/test_dir/symlinks
-/build/source/tests/test_dir/time
+[CWD]/tests/test_dir/git
+[CWD]/tests/test_dir/grid
+[CWD]/tests/test_dir/group
+[CWD]/tests/test_dir/icons
+[CWD]/tests/test_dir/perms
+[CWD]/tests/test_dir/size
+[CWD]/tests/test_dir/specials
+[CWD]/tests/test_dir/symlinks
+[CWD]/tests/test_dir/time