utils-std

commit: f12f2f7f5147af01e08fec7d8a498cdd00ae2be9
parent 1522b4d5b02c1c054aacf13b351fdae5e32084a7
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sat, 11 Oct 2025 02:34:29 +0200

test-cmd/time.t: switch to tap.sh

Diffstat:
A
test-cmd/time.sh
43
+++++++++++++++++++++++++++++++++++++++++++
D
test-cmd/time.t
31
-------------------------------

2 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/test-cmd/time.sh b/test-cmd/time.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
+# SPDX-License-Identifier: MPL-2.0
+
+plans=5
+target="$(dirname "$0")/../cmd/time"
+. "$(dirname "$0")/tap.sh"
+
+usage='Usage: time [-p|-v] command [argument ...]
+'
+
+t noargs '' "$usage"
+
+t --exit=1 erropt '-f' "\
+time: error: Unrecognised option: '-f'
+$usage"
+
+time_fmt() {
+	out=$(mktemp time_fmt.XXXXXX)
+	"$target" "$@" 2> "$out"
+	err=$?
+
+	cut -f1 -d '.' <"$out"
+	rm -f "$out"
+
+	return $err
+}
+
+time_zeroes="\
+real 0
+user 0
+sys 0
+"
+t_cmd --exit=1 false "$time_zeroes" time_fmt false
+t_cmd true "$time_zeroes" time_fmt true
+
+if test "NetBSD" = "$(uname -s)"; then
+	t_skip "# NetBSD somehow doesn't returns ENOENT there, just errno = 0"
+else
+	t --exit=127 enoent '/var/empty/e/no/ent' "\
+time: error: Failed executing '/var/empty/e/no/ent': No such file or directory
+"
+fi
diff --git a/test-cmd/time.t b/test-cmd/time.t
@@ -1,31 +0,0 @@
-#!/usr/bin/env cram
-# SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
-# SPDX-License-Identifier: MPL-2.0
-
-  $ cd $TESTDIR/../cmd
-
-  $ ./time
-  Usage: time [-p|-v] command [argument ...]
-
-  $ ./time -f
-  time: error: Unrecognised option: '-f'
-  Usage: time [-p|-v] command [argument ...]
-  [1]
-
-  $ ./time false
-  real 0.[0-9]* (re)
-  user 0.[0-9]* (re)
-  sys 0.[0-9]* (re)
-  [1]
-
-  $ ./time true
-  real 0.[0-9]* (re)
-  user 0.[0-9]* (re)
-  sys 0.[0-9]* (re)
-
-# NetBSD somehow doesn't returns ENOENT there, just errno = 0
-  $ test "NetBSD" != "$(uname -s)" || exit 80
-
-  $ ./time /var/empty/e/no/ent
-  time: error: Failed executing '/var/empty/e/no/ent': No such file or directory
-  [127]