From fdbdcc2ea1ab813f1fb9302f9a0e47d94ce33108 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 1 Feb 2021 10:05:04 -0600 Subject: The new TEST_GLUE config symbol for [ ] can't have TOYBOX prefix or else singlemake enables it for all commands. (I was trying to move it out of the command namespace, but it's not a global config option either...) --- toys/posix/test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'toys/posix') diff --git a/toys/posix/test.c b/toys/posix/test.c index 2f2dd918..d1ea1663 100644 --- a/toys/posix/test.c +++ b/toys/posix/test.c @@ -3,9 +3,11 @@ * Copyright 2018 Rob Landley * * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html + * + * TODO sh [[ ]] options: < aaa bbb>aaa ~= regex USE_TEST(NEWTOY(test, 0, TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_NOHELP|TOYFLAG_MAYFORK)) -USE_TOYBOX_TEST_GLUE(OLDTOY([, test, TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_NOHELP)) +USE_TEST_GLUE(OLDTOY([, test, TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_NOHELP)) config TEST bool "test" @@ -28,7 +30,7 @@ config TEST --- Tests with one argument on each side of an operator: Two strings: - = are identical != differ < aaa bbb>aaa + = are identical != differ Two integers: -eq equal -gt first > second -lt first < second @@ -38,7 +40,7 @@ config TEST ! EXPR not (swap true/false) EXPR -a EXPR and (are both true) ( EXPR ) evaluate this first EXPR -o EXPR or (is either true) -config TOYBOX_TEST_GLUE +config TEST_GLUE bool default y depends on TEST || SH -- cgit v1.2.3