From: Viktor Szakats Date: Mon, 27 Jan 2025 18:32:45 +0000 (+0100) Subject: checksrc: exclude generated bundle files to avoid race condition X-Git-Tag: curl-8_12_0~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81e271f45cad561e8c39f5beeb317b0c7079f4b6;p=thirdparty%2Fcurl.git 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 fa6c9756b5..b77d10bb22 100644 --- 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 6e7fedb844..0969d81650 100644 --- 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 45eb20a866..c1363d8dd7 100644 --- 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 811ffac996..8f3d3d171e 100644 --- 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])