Update the documentation and github CI actions (seeing all failures on
github makes sense because most people looking at failing Darwin test
runs there won't be able to reproduce locally for lack of a Mac).
---
 .github/workflows/toybox.yml | 6 +++---
 scripts/help.txt             | 4 ++--
 scripts/runtest.sh           | 3 ++-
 www/faq.html                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)
From 8e90b56208432f9f0a35c01a1b2a74461a317f65 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <e...@google.com>
Date: Sat, 25 Sep 2021 19:50:29 -0700
Subject: [PATCH] The VERBOSE= behavior changed a while ago.

Update the documentation and github CI actions (seeing all failures on
github makes sense because most people looking at failing Darwin test
runs there won't be able to reproduce locally for lack of a Mac).
---
 .github/workflows/toybox.yml | 6 +++---
 scripts/help.txt             | 4 ++--
 scripts/runtest.sh           | 3 ++-
 www/faq.html                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/toybox.yml b/.github/workflows/toybox.yml
index 1b463b2a..79403217 100644
--- a/.github/workflows/toybox.yml
+++ b/.github/workflows/toybox.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Build
       run: make
     - name: Test
-      run: VERBOSE=1 make tests
+      run: VERBOSE=all make tests
 
   MacOS-10_15:
     runs-on: macos-10.15
@@ -33,7 +33,7 @@ jobs:
     - name: Build
       run: make
     - name: Test
-      run: VERBOSE=1 make tests
+      run: VERBOSE=all make tests
 
   Ubuntu-20_04:
     runs-on: ubuntu-20.04
@@ -47,4 +47,4 @@ jobs:
     - name: Build
       run: make
     - name: Test
-      run: VERBOSE=1 make tests
+      run: VERBOSE=all make tests
diff --git a/scripts/help.txt b/scripts/help.txt
index 5bf0d613..d369e47a 100644
--- a/scripts/help.txt
+++ b/scripts/help.txt
@@ -7,8 +7,8 @@
   bloatcheck      - Report size differences between old and current versions
   test_COMMAND    - Run tests for COMMAND (test_ps, test_cat, etc.)
   tests           - Run test suite against all compiled commands.
-                    export TEST_HOST=1 to test host command, VERBOSE=1
-                    to show diff, VERBOSE=fail to stop after first failure.
+                    export TEST_HOST=1 to test host command, VERBOSE=all
+                    to show all failures.
   clean           - Delete temporary files.
   distclean       - Delete everything that isn't shipped.
   install_airlock - Install toybox and host toolchain into $PREFIX directory
diff --git a/scripts/runtest.sh b/scripts/runtest.sh
index 158ed7fa..685ecaa6 100644
--- a/scripts/runtest.sh
+++ b/scripts/runtest.sh
@@ -9,8 +9,9 @@
 # The following environment variables enable optional behavior in "testing":
 #    DEBUG - Show every command run by test script.
 #    VERBOSE - "all" continue after failed test
-#              "quiet" like all but just print FAIL (no diff -u).
+#              "fail" show diff and stop at first failed test
 #              "nopass" don't show successful tests
+#              "quiet" like all but just print FAIL (no diff -u).
 #
 # The "testcmd" function takes five arguments:
 #	$1) Description to display when running command
diff --git a/www/faq.html b/www/faq.html
index 803d7b56..e6fa6160 100755
--- a/www/faq.html
+++ b/www/faq.html
@@ -252,8 +252,8 @@ level you can "make tests" to test everything, or "make test_sed" to test a
 single command's standalone version (which should behave identically,
 but that's why we test). You can set TEST_HOST=1 to test the host version
 instead of the toybox version (in theory they should work the same),
-and VERBOSE=1 to see diffs of the expected and actual output when a
-test fails. Set VERBOSE=fail to stop at the first such failure.</p>
+and VERBOSE=all to see diffs of the expected and actual output for all
+failing tests. The default VERBOSE=fail stops at the first such failure.</p>
 
 <hr /><h2><a name="when" />Q: When were historical toybox versions released?</h2>
 
-- 
2.33.0.685.g46640cef36-goog

_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Reply via email to