unix-Makefile.tmpl and ci.yml: Merge cmd-nits into doc-nits

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15329)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71750aec7a0fdffeebb2b3b2e94c90192e80d0d1..46a096cb753fbbb94bfd17b62e8dbe195768f81f 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,8 +37,8 @@ jobs:
       run: ./config --banner=Configured --strict-warnings enable-fips && perl configdata.pm --dump
     - name: make build_generated
       run: make -s build_generated
-    - name: make doc-nits cmd-nits
-      run: make doc-nits cmd-nits
+    - name: make doc-nits
+      run: make doc-nits
 
   # This checks that we use ANSI C language syntax and semantics.
   # We are not as strict with libraries, but rather adapt to what's

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 8b45e75f57d2d2ec9dafd8fda609a7c44a019b1e..92e181befb9efd0af89c1df8c7e8bd938fe16b4c 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -569,7 +569,7 @@ clean: libclean
        -find . -name '*{- platform->depext() -}' \! -name '.*' \! -type d -exec $(RM) {} \;
        -find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -exec $(RM) {} \;
        $(RM) core
-       $(RM) tags TAGS doc-nits cmd-nits md-nits
+       $(RM) tags TAGS doc-nits md-nits
        $(RM) -r test/test-runs
        $(RM) providers/fips*.new
        $(RM) openssl.pc libcrypto.pc libssl.pc
@@ -1064,12 +1064,9 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects \
 
 generate_buildinfo: generate_doc_buildinfo
 
-.PHONY: doc-nits cmd-nits md-nits
+.PHONY: doc-nits md-nits
 doc-nits: build_generated_pods
-       $(PERL) $(SRCDIR)/util/find-doc-nits -n -l -e
-
-cmd-nits: build_generated_pods
-       $(PERL) $(SRCDIR)/util/find-doc-nits -c
+       $(PERL) $(SRCDIR)/util/find-doc-nits -c -n -l -e
 
 # This uses "mdl", the markdownlint application, which is written in ruby.
 # The source is at https://github.com/markdownlint/markdownlint

diff --git a/util/find-doc-nits b/util/find-doc-nits
index 8a27a00bdfdff6e2028dffe0445dee1bba3a8b6b..e8439b8626129b875606a75ee5188797cb352a51 100755 (executable)
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -1141,8 +1141,6 @@ if ( $opt_c ) {
             checkflags($cmd, @doc);
         }
     }
-
-    exit $status;
 }
 
 # Populate %state