[PATCH v4 1/2] debug: Autogenerate _FORTIFY_SOURCE tests
Siddhesh Poyarekar
siddhesh@sourceware.org
Tue Jan 11 15:28:41 GMT 2022
On 11/01/2022 18:57, Adhemerval Zanella via Libc-alpha wrote:
> I see no much point in regenerate adding the auto-generated files on
> repository, I think it would be better to move them to build directory
> instead.
Fair point.
> The changes below based on your patch should do it. I had to do a special
> iterator to handle the C++ files.
>
> diff --git a/debug/Makefile b/debug/Makefile
> index b5e13eec94..7c9023b55a 100644
> --- a/debug/Makefile
> +++ b/debug/Makefile
> @@ -148,12 +148,6 @@ tests-$(1)-chk += tst-fortify-$(1)-$(2)-$(3)
> CFLAGS-tst-fortify-$(1)-$(2)-$(3).$(1) += -D_FORTIFY_SOURCE=$(3) -Wno-format \
> -Wno-deprecated-declarations \
> -Wno-error
> -$(eval $(call cflags-$(2),$(1),$(3)))
> -tst-fortify-$(1)-$(2)-$(3).$(1): tst-fortify.c Makefile
> - ( echo "/* Autogenerated from Makefile. */"; \
> - echo "$(src-chk-$(2))"; \
> - echo "#include \"tst-fortify.c\"" ) > $$@.tmp
> - mv $$@.tmp $$@
> endef
>
> chk-extensions = c cc
> @@ -167,6 +161,32 @@ $(foreach e,$(chk-extensions), \
>
> tests-all-chk += $(tests-c-chk) $(tests-cc-chk)
>
> +generated += \
> + $(addsuffix .c, $(tests-c-chk)) \
> + $(addsuffix .cc, $(tests-cc-chk)) \
> + gen-debug-templates
> +
> +$(objpfx)gen-debug-templates.stmp: tst-fortify.c Makefile
> + $(make-target-directory)
> + for e in $(chk-extensions); do \
> + for t in $(chk-types); do \
> + for l in $(chk-levels); do \
> + file=$(objpfx)tst-fortify-$${e}-$${t}-$${l}.$${e}; \
> + ( \
> + echo "/* Autogenerated from Makefile. */"; \
> + echo "#include \"tst-fortify.c\"" \
> + ) > $${file}; \
> + done; \
> + done; \
> + done; \
> + echo > $(@)
Trouble here is that if one of the sources goes missing, there's no rule
to regenerate it, so an incremental build with a new autogenerated test
won't work.
Maybe ditch the generator and keep the above rules to generate sources,
except that they generate the sources in $(objpfx) instead of the source
directory?
> +
> +# Add dependency to ensure the generator runs prior.
> +$(foreach t, $(tests-c-chk), $(objpfx)$(t).c): \
> + $(objpfx)gen-debug-templates.stmp
> +$(foreach t, $(tests-cc-chk), $(objpfx)$(t).cc): \
> + $(objpfx)gen-debug-templates.stmp
> +
> define link-cc
> LDLIBS-$(1) = -lstdc++
> endef
> @@ -222,6 +242,12 @@ generated += xtrace
>
> include ../Rules
>
> +define o-iterator-doit
> +$(objpfx)${o}.o: $(objpfx)$(o).cc $(before-compile); $$(compile-command.cc)
> +endef
> +object-suffixes-left := $(tests-cc-chk)
> +include $(o-iterator)
> +
> ifeq ($(run-built-tests),yes)
> LOCALES := de_DE.UTF-8
> include ../gen-locales.mk
> diff --git a/debug/tst-fortify-c-default-1.c b/debug/tst-fortify-c-default-1.c
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-c-default-1.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-default-2.c b/debug/tst-fortify-c-default-2.c
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-c-default-2.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-default-3.c b/debug/tst-fortify-c-default-3.c
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-c-default-3.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-lfs-1.c b/debug/tst-fortify-c-lfs-1.c
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-c-lfs-1.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-lfs-2.c b/debug/tst-fortify-c-lfs-2.c
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-c-lfs-2.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-lfs-3.c b/debug/tst-fortify-c-lfs-3.c
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-c-lfs-3.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-nongnu-1.c b/debug/tst-fortify-c-nongnu-1.c
> deleted file mode 100644
> index 5266984fa3..0000000000
> --- a/debug/tst-fortify-c-nongnu-1.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -#undef _GNU_SOURCE
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-nongnu-2.c b/debug/tst-fortify-c-nongnu-2.c
> deleted file mode 100644
> index 5266984fa3..0000000000
> --- a/debug/tst-fortify-c-nongnu-2.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -#undef _GNU_SOURCE
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-c-nongnu-3.c b/debug/tst-fortify-c-nongnu-3.c
> deleted file mode 100644
> index 5266984fa3..0000000000
> --- a/debug/tst-fortify-c-nongnu-3.c
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -#undef _GNU_SOURCE
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-default-1.cc b/debug/tst-fortify-cc-default-1.cc
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-cc-default-1.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-default-2.cc b/debug/tst-fortify-cc-default-2.cc
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-cc-default-2.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-default-3.cc b/debug/tst-fortify-cc-default-3.cc
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-cc-default-3.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-lfs-1.cc b/debug/tst-fortify-cc-lfs-1.cc
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-cc-lfs-1.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-lfs-2.cc b/debug/tst-fortify-cc-lfs-2.cc
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-cc-lfs-2.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-lfs-3.cc b/debug/tst-fortify-cc-lfs-3.cc
> deleted file mode 100644
> index 08a5a758bb..0000000000
> --- a/debug/tst-fortify-cc-lfs-3.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-nongnu-1.cc b/debug/tst-fortify-cc-nongnu-1.cc
> deleted file mode 100644
> index 5266984fa3..0000000000
> --- a/debug/tst-fortify-cc-nongnu-1.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -#undef _GNU_SOURCE
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-nongnu-2.cc b/debug/tst-fortify-cc-nongnu-2.cc
> deleted file mode 100644
> index 5266984fa3..0000000000
> --- a/debug/tst-fortify-cc-nongnu-2.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -#undef _GNU_SOURCE
> -#include "tst-fortify.c"
> diff --git a/debug/tst-fortify-cc-nongnu-3.cc b/debug/tst-fortify-cc-nongnu-3.cc
> deleted file mode 100644
> index 5266984fa3..0000000000
> --- a/debug/tst-fortify-cc-nongnu-3.cc
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -/* Autogenerated from Makefile. */
> -#undef _GNU_SOURCE
> -#include "tst-fortify.c"
>
>> diff --git a/debug/tst-chk2.c b/debug/tst-chk2.c
>> deleted file mode 100644
>> index be37ce2d22..0000000000
>> --- a/debug/tst-chk2.c
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FORTIFY_SOURCE 1
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-chk3.c b/debug/tst-chk3.c
>> deleted file mode 100644
>> index 38b8e4fb36..0000000000
>> --- a/debug/tst-chk3.c
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FORTIFY_SOURCE 2
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-chk4.cc b/debug/tst-chk4.cc
>> deleted file mode 100644
>> index c82e6aac86..0000000000
>> --- a/debug/tst-chk4.cc
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-chk5.cc b/debug/tst-chk5.cc
>> deleted file mode 100644
>> index be37ce2d22..0000000000
>> --- a/debug/tst-chk5.cc
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FORTIFY_SOURCE 1
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-chk6.cc b/debug/tst-chk6.cc
>> deleted file mode 100644
>> index 38b8e4fb36..0000000000
>> --- a/debug/tst-chk6.cc
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FORTIFY_SOURCE 2
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-chk7.c b/debug/tst-chk7.c
>> deleted file mode 100644
>> index 2a7b323812..0000000000
>> --- a/debug/tst-chk7.c
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FORTIFY_SOURCE 3
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-chk8.cc b/debug/tst-chk8.cc
>> deleted file mode 100644
>> index 2a7b323812..0000000000
>> --- a/debug/tst-chk8.cc
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FORTIFY_SOURCE 3
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-fortify-c-default-1.c b/debug/tst-fortify-c-default-1.c
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-c-default-1.c
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-c-default-2.c b/debug/tst-fortify-c-default-2.c
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-c-default-2.c
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-c-default-3.c b/debug/tst-fortify-c-default-3.c
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-c-default-3.c
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-c-lfs-1.c b/debug/tst-fortify-c-lfs-1.c
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-c-lfs-1.c
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-c-lfs-2.c b/debug/tst-fortify-c-lfs-2.c
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-c-lfs-2.c
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-c-lfs-3.c b/debug/tst-fortify-c-lfs-3.c
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-c-lfs-3.c
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-cc-default-1.cc b/debug/tst-fortify-cc-default-1.cc
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-cc-default-1.cc
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-cc-default-2.cc b/debug/tst-fortify-cc-default-2.cc
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-cc-default-2.cc
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-cc-default-3.cc b/debug/tst-fortify-cc-default-3.cc
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-cc-default-3.cc
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-cc-lfs-1.cc b/debug/tst-fortify-cc-lfs-1.cc
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-cc-lfs-1.cc
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-cc-lfs-2.cc b/debug/tst-fortify-cc-lfs-2.cc
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-cc-lfs-2.cc
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-fortify-cc-lfs-3.cc b/debug/tst-fortify-cc-lfs-3.cc
>> new file mode 100644
>> index 0000000000..08a5a758bb
>> --- /dev/null
>> +++ b/debug/tst-fortify-cc-lfs-3.cc
>> @@ -0,0 +1,3 @@
>> +/* Autogenerated from Makefile. */
>> +
>> +#include "tst-fortify.c"
>> diff --git a/debug/tst-chk1.c b/debug/tst-fortify.c
>> similarity index 100%
>> rename from debug/tst-chk1.c
>> rename to debug/tst-fortify.c
>> diff --git a/debug/tst-lfschk1.c b/debug/tst-lfschk1.c
>> deleted file mode 100644
>> index f3e6d47d5e..0000000000
>> --- a/debug/tst-lfschk1.c
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FILE_OFFSET_BITS 64
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-lfschk2.c b/debug/tst-lfschk2.c
>> deleted file mode 100644
>> index 95d4db1d32..0000000000
>> --- a/debug/tst-lfschk2.c
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FILE_OFFSET_BITS 64
>> -#include "tst-chk2.c"
>> diff --git a/debug/tst-lfschk3.c b/debug/tst-lfschk3.c
>> deleted file mode 100644
>> index 50a1ae1258..0000000000
>> --- a/debug/tst-lfschk3.c
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FILE_OFFSET_BITS 64
>> -#include "tst-chk3.c"
>> diff --git a/debug/tst-lfschk4.cc b/debug/tst-lfschk4.cc
>> deleted file mode 100644
>> index f3e6d47d5e..0000000000
>> --- a/debug/tst-lfschk4.cc
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FILE_OFFSET_BITS 64
>> -#include "tst-chk1.c"
>> diff --git a/debug/tst-lfschk5.cc b/debug/tst-lfschk5.cc
>> deleted file mode 100644
>> index 95d4db1d32..0000000000
>> --- a/debug/tst-lfschk5.cc
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FILE_OFFSET_BITS 64
>> -#include "tst-chk2.c"
>> diff --git a/debug/tst-lfschk6.cc b/debug/tst-lfschk6.cc
>> deleted file mode 100644
>> index 50a1ae1258..0000000000
>> --- a/debug/tst-lfschk6.cc
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -#define _FILE_OFFSET_BITS 64
>> -#include "tst-chk3.c"
>
More information about the Libc-alpha
mailing list