From 2d5edb37b924715b4fbee4d917ac334c773fca61 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 7 Nov 2022 15:10:50 -0500
Subject: tests/xtouch: New utility

POSIX touch(1) doesn't include the -h option, and indeed OpenBSD doesn't
implement it.  Making our own utility also lets us add some handy
extensions like -p (create parents) and -M (set permissions).
---
 tests/gnu/fprint_duplicate.sh           | 2 +-
 tests/gnu/ignore_readdir_race.sh        | 2 +-
 tests/gnu/ignore_readdir_race_notdir.sh | 4 ++--
 tests/gnu/xtype_bind_mount.sh           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/gnu')

diff --git a/tests/gnu/fprint_duplicate.sh b/tests/gnu/fprint_duplicate.sh
index b4eb047..5275502 100644
--- a/tests/gnu/fprint_duplicate.sh
+++ b/tests/gnu/fprint_duplicate.sh
@@ -1,4 +1,4 @@
-touchp scratch/foo.out
+"$XTOUCH" -p scratch/foo.out
 ln scratch/foo.out scratch/foo.hard
 ln -s foo.out scratch/foo.soft
 
diff --git a/tests/gnu/ignore_readdir_race.sh b/tests/gnu/ignore_readdir_race.sh
index 547253b..6586bcc 100644
--- a/tests/gnu/ignore_readdir_race.sh
+++ b/tests/gnu/ignore_readdir_race.sh
@@ -1,5 +1,5 @@
 clean_scratch
-$TOUCH scratch/{foo,bar}
+"$XTOUCH" scratch/{foo,bar}
 
 # -links 1 forces a stat() call, which will fail for the second file
 invoke_bfs scratch -mindepth 1 -ignore_readdir_race -links 1 -exec "$TESTS/remove-sibling.sh" {} \;
diff --git a/tests/gnu/ignore_readdir_race_notdir.sh b/tests/gnu/ignore_readdir_race_notdir.sh
index 91a383b..5b8b56d 100644
--- a/tests/gnu/ignore_readdir_race_notdir.sh
+++ b/tests/gnu/ignore_readdir_race_notdir.sh
@@ -1,5 +1,5 @@
 # Check -ignore_readdir_race handling when a directory is replaced with a file
 clean_scratch
-touchp scratch/foo/bar
+"$XTOUCH" -p scratch/foo/bar
 
-invoke_bfs scratch -mindepth 1 -ignore_readdir_race -execdir rm -r {} \; -execdir $TOUCH {} \;
+invoke_bfs scratch -mindepth 1 -ignore_readdir_race -execdir rm -r {} \; -execdir "$XTOUCH" {} \;
diff --git a/tests/gnu/xtype_bind_mount.sh b/tests/gnu/xtype_bind_mount.sh
index d371cd5..264b6f8 100644
--- a/tests/gnu/xtype_bind_mount.sh
+++ b/tests/gnu/xtype_bind_mount.sh
@@ -2,7 +2,7 @@ skip_unless test "$SUDO"
 skip_unless test "$UNAME" = "Linux"
 
 clean_scratch
-$TOUCH scratch/{file,null}
+"$XTOUCH" scratch/{file,null}
 sudo mount --bind /dev/null scratch/null
 ln -s /dev/null scratch/link
 
-- 
cgit v1.2.3