checksrc: exclude generated bundle files to avoid race condition

Necessary to catch rare cases when `checksrc` hits these files when they
are not populated yet:
```
./curltool_unity.c:1:1: error: Missing copyright statement (COPYRIGHT)
 ^
```
https://github.com/curl/curl/actions/runs/12995546740/job/36242556713?pr=16094#step:37:123

Follow-up to 71cf0d1fca9e1f53524e1545ef0c08d174458d80 #14772
Closes #16102

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fa6c9756b5962f41493578c0578d209874ca9430..b77d10bb22b30f8952a8526ce59366e459fea514 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -143,9 +143,10 @@ CS_1 =
 CS_ = $(CS_0)
 
 checksrc:
-       $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir)    \
-       -W$(srcdir)/curl_config.h $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch]   \
-       $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch] $(srcdir)/vssh/*.[ch])
+       $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir)         \
+         -W$(srcdir)/libcurl_unity.c -W$(srcdir)/curl_config.h $(srcdir)/*.[ch] \
+         $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch]    \
+         $(srcdir)/vssh/*.[ch])
 
 if DEBUGBUILD
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/src/Makefile.am b/src/Makefile.am
index 6e7fedb8440aa8c9da393a34970458034c0239a5..0969d816507afbd84cd332980c1f6edbb3d6835e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,6 +188,8 @@ checksrc:
        $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
          -W$(srcdir)/$(HUGE) \
          -W$(srcdir)/$(CA_EMBED_CSOURCE) \
+         -W$(srcdir)/curltool_unity.c \
+         -W$(srcdir)/libcurltool_unity.c \
          $(srcdir)/*.[ch])
 
 if DEBUGBUILD

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 45eb20a866aa767c546be65319979e044cb1dd8d..c1363d8dd7c1b92200c3384b183c79593d5d4c5a 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -118,8 +118,11 @@ CS_0 = @echo "  RUN     " $@;
 CS_1 =
 CS_ = $(CS_0)
 
+# ignore generated C files since they play by slightly different rules!
 checksrc:
-       $(CHECKSRC)@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) $(srcdir)/*.[ch]
+       $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
+         -W$(srcdir)/libtest_bundle.c \
+         $(srcdir)/*.[ch])
 
 if DEBUGBUILD
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 811ffac99678b982cafe7addab326abad45b0d64..8f3d3d171e76cde19799e03e4c019a7fcea94d01 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -74,5 +74,8 @@ CS_0 = @echo "  RUN     " $@;
 CS_1 =
 CS_ = $(CS_0)
 
+# ignore generated C files since they play by slightly different rules!
 checksrc:
-       $(CHECKSRC)@PERL@ $(top_srcdir)/scripts/checksrc.pl $(srcdir)/*.[ch]
+       $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \
+         -W$(srcdir)/unit_bundle.c \
+         $(srcdir)/*.[ch])