From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 263F2159C9B for ; Sun, 11 Aug 2024 10:11:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D0E82BC132; Sun, 11 Aug 2024 10:11:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 075592BC10D for ; Sun, 11 Aug 2024 10:11:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3B60343113 for ; Sun, 11 Aug 2024 10:11:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CA471EF2 for ; Sun, 11 Aug 2024 10:11:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1723371064.29c0a982c1a0c7c985d02fc8833eff16036e8366.sam@gentoo> Subject: [gentoo-commits] proj/gentoo-functions:master commit in: / X-VCS-Repository: proj/gentoo-functions X-VCS-Files: test-functions X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 29c0a982c1a0c7c985d02fc8833eff16036e8366 X-VCS-Branch: master Date: Sun, 11 Aug 2024 10:11:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab559ba8-e405-428c-a2d7-9ea8ed470ee6 X-Archives-Hash: 1c8fa03d5997b4c792de80eab7764576 commit: 29c0a982c1a0c7c985d02fc8833eff16036e8366 Author: Kerin Millar plushkava net> AuthorDate: Sat Aug 10 06:08:05 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 11 10:11:04 2024 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=29c0a982 test-functions: consistently align the test parameter declarations This is merely a whitespace cleanup. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> test-functions | 264 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 132 insertions(+), 132 deletions(-) diff --git a/test-functions b/test-functions index 81593b8..fe26905 100755 --- a/test-functions +++ b/test-functions @@ -84,9 +84,9 @@ test_chdir() { test_die() { set -- \ - eq 1 0 \ - eq 2 2 \ - eq 126 126 \ + eq 1 0 \ + eq 2 2 \ + eq 126 126 \ eq 255 255 callback() { @@ -141,59 +141,59 @@ test_is_older_than() { local age tstamp set -- \ - ge 1 N/A N/A \ - ge 1 newer N/A \ - ge 1 newer-empty N/A \ - ge 1 newer/file N/A \ - ge 1 non-existent N/A \ - eq 0 newer newer \ - ge 1 newer newer-empty \ - eq 0 newer newer/file \ - ge 1 newer non-existent \ - ge 1 newer older \ - ge 1 newer older-empty \ - ge 1 newer older/file \ - eq 0 newer-empty newer \ - ge 1 newer-empty newer-empty \ - eq 0 newer-empty newer/file \ - ge 1 newer-empty non-existent \ - ge 1 newer-empty older \ - ge 1 newer-empty older-empty \ - ge 1 newer-empty older/file \ - ge 1 newer/file newer \ - ge 1 newer/file newer-empty \ - ge 1 newer/file newer/file \ - ge 1 newer/file non-existent \ - ge 1 newer/file older \ - ge 1 newer/file older-empty \ - ge 1 newer/file older/file \ - eq 0 non-existent newer \ - eq 0 non-existent newer-empty \ - eq 0 non-existent newer/file \ - ge 1 non-existent non-existent \ - eq 0 non-existent older \ - eq 0 non-existent older-empty \ - eq 0 non-existent older/file \ - eq 0 older newer \ - eq 0 older newer-empty \ - eq 0 older newer/file \ - ge 1 older non-existent \ - eq 0 older older \ - ge 1 older older-empty \ - eq 0 older older/file \ - eq 0 older-empty newer \ - eq 0 older-empty newer-empty \ - eq 0 older-empty newer/file \ - ge 1 older-empty non-existent \ - eq 0 older-empty older \ - ge 1 older-empty older-empty \ - eq 0 older-empty older/file \ - eq 0 older/file newer \ - eq 0 older/file newer-empty \ - eq 0 older/file newer/file \ - ge 1 older/file non-existent \ - ge 1 older/file older \ - ge 1 older/file older-empty \ + ge 1 N/A N/A \ + ge 1 newer N/A \ + ge 1 newer-empty N/A \ + ge 1 newer/file N/A \ + ge 1 non-existent N/A \ + eq 0 newer newer \ + ge 1 newer newer-empty \ + eq 0 newer newer/file \ + ge 1 newer non-existent \ + ge 1 newer older \ + ge 1 newer older-empty \ + ge 1 newer older/file \ + eq 0 newer-empty newer \ + ge 1 newer-empty newer-empty \ + eq 0 newer-empty newer/file \ + ge 1 newer-empty non-existent \ + ge 1 newer-empty older \ + ge 1 newer-empty older-empty \ + ge 1 newer-empty older/file \ + ge 1 newer/file newer \ + ge 1 newer/file newer-empty \ + ge 1 newer/file newer/file \ + ge 1 newer/file non-existent \ + ge 1 newer/file older \ + ge 1 newer/file older-empty \ + ge 1 newer/file older/file \ + eq 0 non-existent newer \ + eq 0 non-existent newer-empty \ + eq 0 non-existent newer/file \ + ge 1 non-existent non-existent \ + eq 0 non-existent older \ + eq 0 non-existent older-empty \ + eq 0 non-existent older/file \ + eq 0 older newer \ + eq 0 older newer-empty \ + eq 0 older newer/file \ + ge 1 older non-existent \ + eq 0 older older \ + ge 1 older older-empty \ + eq 0 older older/file \ + eq 0 older-empty newer \ + eq 0 older-empty newer-empty \ + eq 0 older-empty newer/file \ + ge 1 older-empty non-existent \ + eq 0 older-empty older \ + ge 1 older-empty older-empty \ + eq 0 older-empty older/file \ + eq 0 older/file newer \ + eq 0 older/file newer-empty \ + eq 0 older/file newer/file \ + ge 1 older/file non-existent \ + ge 1 older/file older \ + ge 1 older/file older-empty \ ge 1 older/file older/file # The mtimes need to be explicitly assigned. Empirical evidence has @@ -222,17 +222,17 @@ test_get_bootparam() { cmdline="foo gentoo=bar,baz quux" set -- \ - ge 1 "${cmdline}" N/A \ - ge 1 "${cmdline}" '' \ - ge 1 "gentoo=" '' \ - ge 1 "${cmdline}" foo \ - eq 0 "${cmdline}" bar \ - eq 0 "foo gentoo=gentoo=1,bar baz" bar \ - eq 0 "foo gentoo=bar,gentoo=1 baz" bar \ - eq 0 "${cmdline}" baz \ - ge 1 "${cmdline}" bar,baz \ - eq 0 "foo gentoo=bar,gentoo=1 baz" gentoo=1 \ - eq 0 "foo gentoo=gentoo=1,bar baz" gentoo=1 \ + ge 1 "${cmdline}" N/A \ + ge 1 "${cmdline}" '' \ + ge 1 "gentoo=" '' \ + ge 1 "${cmdline}" foo \ + eq 0 "${cmdline}" bar \ + eq 0 "foo gentoo=gentoo=1,bar baz" bar \ + eq 0 "foo gentoo=bar,gentoo=1 baz" bar \ + eq 0 "${cmdline}" baz \ + ge 1 "${cmdline}" bar,baz \ + eq 0 "foo gentoo=bar,gentoo=1 baz" gentoo=1 \ + eq 0 "foo gentoo=gentoo=1,bar baz" gentoo=1 \ ge 1 "${cmdline}" quux callback() { @@ -249,10 +249,10 @@ test_get_bootparam() { test_esyslog() { set -- \ - ge 1 0 N/A N/A N/A \ - ge 1 0 debug N/A N/A \ - eq 0 0 debug user N/A \ - eq 0 0 debug user '' \ + ge 1 0 N/A N/A N/A \ + ge 1 0 debug N/A N/A \ + eq 0 0 debug user N/A \ + eq 0 0 debug user '' \ eq 0 1 debug user message logger() { @@ -295,7 +295,7 @@ test_is_identifier() { ge 1 /Z \ ge 1 .a \ ge 1 .Z \ - ge 1 '[a' \ + ge 1 '[a' \ ge 1 '[Z' \ ge 1 '`a' \ ge 1 '`Z' \ @@ -346,18 +346,18 @@ test_is_identifier() { test_is_int() { set -- \ - ge 1 N/A \ - ge 1 ' ' \ - ge 1 ' 1 ' \ - ge 1 '' \ - ge 1 +1 \ - ge 1 +008 \ - ge 1 -008 \ - ge 1 008 \ - ge 1 x \ - eq 0 0 \ - eq 0 1 \ - eq 0 -1 \ + ge 1 N/A \ + ge 1 ' ' \ + ge 1 ' 1 ' \ + ge 1 '' \ + ge 1 +1 \ + ge 1 +008 \ + ge 1 -008 \ + ge 1 008 \ + ge 1 x \ + eq 0 0 \ + eq 0 1 \ + eq 0 -1 \ eq 0 123456789 callback() { @@ -371,13 +371,13 @@ test_is_int() { test_is_visible() { set -- \ - ge 1 '' \ - ge 1 ' ' \ - ge 1 "$(printf '\t')" \ - ge 1 "$(printf '\a')" \ - eq 0 . \ - eq 0 ' . ' \ - eq 0 "$(printf '\t.\t')" \ + ge 1 '' \ + ge 1 ' ' \ + ge 1 "$(printf '\t')" \ + ge 1 "$(printf '\a')" \ + eq 0 . \ + eq 0 ' . ' \ + eq 0 "$(printf '\t.\t')" \ eq 0 "$(printf '\a.\a')" callback() { @@ -391,29 +391,29 @@ test_is_visible() { test_yesno() { set -- \ - eq 0 yes \ - eq 0 YES \ - eq 0 Yes \ - eq 0 true \ - eq 0 TRUE \ - eq 0 true \ - eq 0 on \ - eq 0 ON \ - eq 0 On \ - eq 0 1 \ - eq 0 truthful_nameref \ - ge 1 no \ - ge 1 NO \ - ge 1 No \ - ge 1 false \ - ge 1 FALSE \ - ge 1 False \ - ge 1 off \ - ge 1 OFF \ - ge 1 Off \ - ge 1 0 \ - ge 1 not_a_nameref \ - ge 1 not-a-valid-nameref \ + eq 0 yes \ + eq 0 YES \ + eq 0 Yes \ + eq 0 true \ + eq 0 TRUE \ + eq 0 true \ + eq 0 on \ + eq 0 ON \ + eq 0 On \ + eq 0 1 \ + eq 0 truthful_nameref \ + ge 1 no \ + ge 1 NO \ + ge 1 No \ + ge 1 false \ + ge 1 FALSE \ + ge 1 False \ + ge 1 off \ + ge 1 OFF \ + ge 1 Off \ + ge 1 0 \ + ge 1 not_a_nameref \ + ge 1 not-a-valid-nameref \ ge 1 '_"; set -- yes # code injection' # shellcheck disable=2034 @@ -430,16 +430,16 @@ test_yesno() { test_srandom() { set -- \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 \ - eq 0 + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 \ + eq 0 callback() { local number @@ -621,7 +621,7 @@ test_hr() { eq 0 "$(printf '%80s' | tr ' ' -)" - N/A \ eq 0 '' - 0 \ eq 0 - - 1 \ - eq 0 ----------------- - 17 \ + eq 0 ----------------- - 17 \ eq 0 '' xyz 0 \ eq 0 x xyz 1 \ eq 0 xxxxxxxxxxxxxxxxx xyz 17 @@ -1117,13 +1117,13 @@ test_should_throttle() { # return value should always be 1. For the fifth test, integer overflow # is expected to occur. Again, the return value should always be 1. set -- \ - ge 1 "${max_int}" \ - eq 0 2 \ - ge 1 1 \ - ge 1 0 \ - ge 1 2 \ - eq 0 2 \ - ge 1 1 \ + ge 1 "${max_int}" \ + eq 0 2 \ + ge 1 1 \ + ge 1 0 \ + ge 1 2 \ + eq 0 2 \ + ge 1 1 \ ge 1 0 _update_time() {