From a322078bc7f1dedd1040d8a66698a7890f9921a7 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Thu, 5 Aug 2021 16:26:48 -0300
Subject: mv tests/tests-lib.sh tests/lib.sh

---
 tests/cli-opts.sh  |   2 +-
 tests/lib.sh       | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/remotes.sh   |   2 +-
 tests/tests-lib.sh | 143 -----------------------------------------------------
 4 files changed, 145 insertions(+), 145 deletions(-)
 create mode 100755 tests/lib.sh
 delete mode 100755 tests/tests-lib.sh

(limited to 'tests')

diff --git a/tests/cli-opts.sh b/tests/cli-opts.sh
index 44dc6ce..7d38a37 100755
--- a/tests/cli-opts.sh
+++ b/tests/cli-opts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -u
 
-. tests/tests-lib.sh
+. tests/lib.sh
 
 export PATH="$PWD/tests:$PATH"
 
diff --git a/tests/lib.sh b/tests/lib.sh
new file mode 100755
index 0000000..06a5b54
--- /dev/null
+++ b/tests/lib.sh
@@ -0,0 +1,143 @@
+#!/bin/sh
+
+end="\033[0m"
+red="\033[0;31m"
+green="\033[0;32m"
+yellow="\033[0;33m"
+
+N=
+OUT=
+ERR=
+STATUS=
+
+ERROR() {
+	# shellcheck disable=2059
+	printf "${red}ERROR${end}"
+}
+
+print_debug_info() {
+	printf 'LINENO:   %s\nOUT:      %s\nERR:      %s\n' \
+		"$N" "$OUT" "$ERR" >&2
+}
+
+assert_status() {
+	if [ "$STATUS" != "$1" ]; then
+		printf '\n%s: Bad status.\n\nexpected: %s\ngot:      %s\n' \
+			"$(ERROR)" "$1" "$STATUS" >&2
+		print_debug_info
+		exit 1
+	fi
+}
+
+assert_usage() {
+	if ! grep -Fq 'Usage' "$1"; then
+		echo 'Expected to find "Usage" text, it was missing:' >&2
+		cat "$1" >&2
+		print_debug_info
+		exit 1
+	fi
+}
+
+assert_empty_stream() {
+	if [ -s "$2" ]; then
+		FMT='\n%s: Expected %s (%s) to be empty, but has content:\n%s\n'
+		# shellcheck disable=2059
+		printf "$FMT" \
+			"$(ERROR)" "$1" "$2" "$(cat "$2")" >&2
+		print_debug_info
+		exit 1
+	fi
+}
+
+assert_empty_stdout() {
+	assert_empty_stream STDOUT "$OUT"
+}
+
+assert_empty_stderr() {
+	assert_empty_stream STDERR "$ERR"
+}
+
+assert_stream() {
+	if [ "$(cat "$2")" != "$3" ]; then
+		printf '\nERR: Bad %s (%s)\n\nexpected: %s\ngot:      %s\n' \
+			"$1" "$2" "$3" "$(cat "$2")" >&2
+		print_debug_info
+		exit 1
+	fi
+}
+
+assert_stdout() {
+	assert_stream STDOUT "$OUT" "$1"
+}
+
+assert_stderr() {
+	assert_stream STDERR "$ERR" "$1"
+}
+
+assert_grep_stream() {
+	if ! grep -qE "$3" "$2"; then
+		printf '\nERR: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \
+			"$1" "$2" "$3"  "$(cat "$2")" >&2
+		print_debug_info
+		exit 1
+	fi
+}
+
+assert_grep_stdout() {
+	assert_grep_stream STDOUT "$OUT" "$1"
+}
+
+assert_grep_stderr() {
+	assert_grep_stream STDERR "$ERR" "$1"
+}
+
+assert_fgrep_stream() {
+	if ! grep -Fq -- "$3" "$2"; then
+		printf '\nERR: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \
+			"$1" "$2" "$3"  "$(cat "$2")" >&2
+		print_debug_info
+		exit 1
+	fi
+}
+
+assert_fgrep_stdout() {
+	assert_fgrep_stream STDOUT "$OUT" "$1"
+}
+
+assert_fgrep_stderr() {
+	assert_fgrep_stream STDERR "$ERR" "$1"
+}
+
+testing() {
+	printf "${yellow}testing${end}: %s..." "$1" >&2
+}
+
+test_ok() {
+	# shellcheck disable=2059
+	printf " ${green}OK${end}.\n" >&2
+}
+
+uuid() {
+	# Taken from:
+	# https://serverfault.com/a/799198
+	od -xN20 /dev/urandom |
+		head -1 |
+		awk '{OFS="-"; print $2$3,$4,$5,$6,$7$8$9}'
+}
+
+tmpname() {
+	echo 'mkstemp(template)' | m4 -D template="${TMPDIR:-/tmp}/m4-tmpname."
+}
+
+mkstemp() {
+	name="$(tmpname)"
+	touch "$name"
+	echo "$name"
+}
+
+mkdtemp() {
+	name="$(tmpname)"
+	rm -f "$name"
+	mkdir "$name"
+	echo "$name"
+}
diff --git a/tests/remotes.sh b/tests/remotes.sh
index 76aea04..3fff205 100755
--- a/tests/remotes.sh
+++ b/tests/remotes.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -u
 
-. tests/tests-lib.sh
+. tests/lib.sh
 
 TEST_PREFIX="$PWD/tests/prefix/$(uuid)"
 make PREFIX="$TEST_PREFIX" install 1>/dev/null
diff --git a/tests/tests-lib.sh b/tests/tests-lib.sh
deleted file mode 100755
index 06a5b54..0000000
--- a/tests/tests-lib.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-end="\033[0m"
-red="\033[0;31m"
-green="\033[0;32m"
-yellow="\033[0;33m"
-
-N=
-OUT=
-ERR=
-STATUS=
-
-ERROR() {
-	# shellcheck disable=2059
-	printf "${red}ERROR${end}"
-}
-
-print_debug_info() {
-	printf 'LINENO:   %s\nOUT:      %s\nERR:      %s\n' \
-		"$N" "$OUT" "$ERR" >&2
-}
-
-assert_status() {
-	if [ "$STATUS" != "$1" ]; then
-		printf '\n%s: Bad status.\n\nexpected: %s\ngot:      %s\n' \
-			"$(ERROR)" "$1" "$STATUS" >&2
-		print_debug_info
-		exit 1
-	fi
-}
-
-assert_usage() {
-	if ! grep -Fq 'Usage' "$1"; then
-		echo 'Expected to find "Usage" text, it was missing:' >&2
-		cat "$1" >&2
-		print_debug_info
-		exit 1
-	fi
-}
-
-assert_empty_stream() {
-	if [ -s "$2" ]; then
-		FMT='\n%s: Expected %s (%s) to be empty, but has content:\n%s\n'
-		# shellcheck disable=2059
-		printf "$FMT" \
-			"$(ERROR)" "$1" "$2" "$(cat "$2")" >&2
-		print_debug_info
-		exit 1
-	fi
-}
-
-assert_empty_stdout() {
-	assert_empty_stream STDOUT "$OUT"
-}
-
-assert_empty_stderr() {
-	assert_empty_stream STDERR "$ERR"
-}
-
-assert_stream() {
-	if [ "$(cat "$2")" != "$3" ]; then
-		printf '\nERR: Bad %s (%s)\n\nexpected: %s\ngot:      %s\n' \
-			"$1" "$2" "$3" "$(cat "$2")" >&2
-		print_debug_info
-		exit 1
-	fi
-}
-
-assert_stdout() {
-	assert_stream STDOUT "$OUT" "$1"
-}
-
-assert_stderr() {
-	assert_stream STDERR "$ERR" "$1"
-}
-
-assert_grep_stream() {
-	if ! grep -qE "$3" "$2"; then
-		printf '\nERR: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \
-			"$1" "$2" "$3"  "$(cat "$2")" >&2
-		print_debug_info
-		exit 1
-	fi
-}
-
-assert_grep_stdout() {
-	assert_grep_stream STDOUT "$OUT" "$1"
-}
-
-assert_grep_stderr() {
-	assert_grep_stream STDERR "$ERR" "$1"
-}
-
-assert_fgrep_stream() {
-	if ! grep -Fq -- "$3" "$2"; then
-		printf '\nERR: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \
-			"$1" "$2" "$3"  "$(cat "$2")" >&2
-		print_debug_info
-		exit 1
-	fi
-}
-
-assert_fgrep_stdout() {
-	assert_fgrep_stream STDOUT "$OUT" "$1"
-}
-
-assert_fgrep_stderr() {
-	assert_fgrep_stream STDERR "$ERR" "$1"
-}
-
-testing() {
-	printf "${yellow}testing${end}: %s..." "$1" >&2
-}
-
-test_ok() {
-	# shellcheck disable=2059
-	printf " ${green}OK${end}.\n" >&2
-}
-
-uuid() {
-	# Taken from:
-	# https://serverfault.com/a/799198
-	od -xN20 /dev/urandom |
-		head -1 |
-		awk '{OFS="-"; print $2$3,$4,$5,$6,$7$8$9}'
-}
-
-tmpname() {
-	echo 'mkstemp(template)' | m4 -D template="${TMPDIR:-/tmp}/m4-tmpname."
-}
-
-mkstemp() {
-	name="$(tmpname)"
-	touch "$name"
-	echo "$name"
-}
-
-mkdtemp() {
-	name="$(tmpname)"
-	rm -f "$name"
-	mkdir "$name"
-	echo "$name"
-}
-- 
cgit v1.2.3