Re: [PATCH] fix tarball compile failure due to missing tests/checksums.c

[Vladimir 'φ-coder/phcoder' Serbinenko]

Go ahead.

On 02.05.2013 22:13, Andrey Borzenkov wrote:

> make[3]: Entering directory `/home/bor/build/grub/grub-2.00/grub-core'
> gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W -I../include -I../include  
> -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -DGRUB_TARGET_CPU_I386=1 -m32 
> -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include 
> -DGRUB_FILE=\"tests/video_checksum.c\" ... -c -o 
> tests/functional_test_module-video_checksum.o `test -f 
> 'tests/video_checksum.c' || echo './'`tests/video_checksum.c
> tests/video_checksum.c:342:23: fatal error: checksums.c: No such file or 
> directory
> compilation terminated.
> 
> So let's do it right - rename checksums.c into checksums.h and add
> it as source file. The reason for rename
> 
> - we want to track proper dependency on checksums.c
> - we want also to distribute it
> - the proper way to do it is to add it as source file to module
> - if checksums.c is added to module definition, automake will try to
>   compile it, which is wrong - it cannot be compiled separately
> 
> Renaming it into checksums.h does the right thing
> 
> - it tracks dependency on it
> - it adds it to dist tarball
> - it does not attempt to compile it
> 
> and all this with just a single line in module definition :)
> 
> ---
>  grub-core/Makefile.core.def      |  1 +
>  grub-core/tests/checksums.c      | 27 ---------------------------
>  grub-core/tests/checksums.h      | 27 +++++++++++++++++++++++++++
>  grub-core/tests/video_checksum.c |  4 ++--
>  4 files changed, 30 insertions(+), 29 deletions(-)
> 
> diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
> index 2fa0ea7..7c904b9 100644
> --- a/grub-core/Makefile.core.def
> +++ b/grub-core/Makefile.core.def
> @@ -1731,6 +1731,7 @@ module = {
>    name = functional_test;
>    common = tests/lib/functional_test.c;
>    common = tests/lib/test.c;
> +  common = tests/checksums.h;
>    common = tests/video_checksum.c;
>    common = tests/fake_input.c;
>    common = video/capture.c;
> diff --git a/grub-core/tests/checksums.c b/grub-core/tests/checksums.c
> deleted file mode 100644
> index 93d100f..0000000
> --- a/grub-core/tests/checksums.c
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -  { "videotest", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 
> 640x480xi16 */, (grub_uint32_t []) { 0x7f1853ba, 0x7f1853ba, 0x7f1853ba, 
> 0x7f1853ba, 0x7f1853ba, }, 5 },
> -  { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 
> 800x600xi16 */, (grub_uint32_t []) { 0xff1957f0, 0xff1957f0, 0xff1957f0, 
> 0xff1957f0, 0xff1957f0, }, 5 },
> -  { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 
> 1024x768xi16 */, (grub_uint32_t []) { 0xcb45d8c5, 0xcb45d8c5, 0xcb45d8c5, 
> 0xcb45d8c5, 0xcb45d8c5, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 
> 640x480xrgb555 */, (grub_uint32_t []) { 0x2c97569c, 0x2c97569c, 0x2c97569c, 
> 0x2c97569c, 0x2c97569c, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 
> 800x600xrgb555 */, (grub_uint32_t []) { 0x9bd7a3ac, 0x9bd7a3ac, 0x9bd7a3ac, 
> 0x9bd7a3ac, 0x9bd7a3ac, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 
> 1024x768xrgb555 */, (grub_uint32_t []) { 0xedbceb9c, 0xedbceb9c, 0xedbceb9c, 
> 0xedbceb9c, 0xedbceb9c, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 
> 640x480xrgb565 */, (grub_uint32_t []) { 0x3c2a42f1, 0x3c2a42f1, 0x3c2a42f1, 
> 0x3c2a42f1, 0x3c2a42f1, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 
> 800x600xrgb565 */, (grub_uint32_t []) { 0xb25ce62a, 0xb25ce62a, 0xb25ce62a, 
> 0xb25ce62a, 0xb25ce62a, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 
> 1024x768xrgb565 */, (grub_uint32_t []) { 0x66cee14c, 0x66cee14c, 0x66cee14c, 
> 0x66cee14c, 0x66cee14c, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 
> 640x480xrgb888 */, (grub_uint32_t []) { 0x61db45b7, 0x1d867efe, 0x99613325, 
> 0xe53c086c, 0x9543de62, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 
> 800x600xrgb888 */, (grub_uint32_t []) { 0xa46eb37f, 0xd2a59656, 0x49f8f92d, 
> 0x3f33dc04, 0x7aae512a, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 
> 1024x768xrgb888 */, (grub_uint32_t []) { 0xb864a496, 0x6c22313b, 0x1505f93d, 
> 0xc1436c90, 0xe74a6931, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 
> 640x480xrgb888 */, (grub_uint32_t []) { 0x2b154617, 0x692e98df, 0xaf62fb87, 
> 0xed59254f, 0x26164bc6, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 
> 800x600xrgb888 */, (grub_uint32_t []) { 0x3b0fbc56, 0xd9d57c0e, 0xfb564a17, 
> 0x198c8a4f, 0xbe502625, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 
> 1024x768xrgb888 */, (grub_uint32_t []) { 0x6e6c9b36, 0x4ae9f137, 0x27664f34, 
> 0x3e32535, 0xfc793332, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 
> 640x480xbgr555 */, (grub_uint32_t []) { 0x9056f776, 0x9056f776, 0x9056f776, 
> 0x9056f776, 0x9056f776, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 
> 800x600xbgr555 */, (grub_uint32_t []) { 0x2bde3c67, 0x2bde3c67, 0x2bde3c67, 
> 0x2bde3c67, 0x2bde3c67, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 
> 1024x768xbgr555 */, (grub_uint32_t []) { 0xb04615f3, 0xb04615f3, 0xb04615f3, 
> 0xb04615f3, 0xb04615f3, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 
> 640x480xbgr565 */, (grub_uint32_t []) { 0xba8df8dd, 0xba8df8dd, 0xba8df8dd, 
> 0xba8df8dd, 0xba8df8dd, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 
> 800x600xbgr565 */, (grub_uint32_t []) { 0x84ac1329, 0x84ac1329, 0x84ac1329, 
> 0x84ac1329, 0x84ac1329, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 
> 1024x768xbgr565 */, (grub_uint32_t []) { 0x145ad698, 0x145ad698, 0x145ad698, 
> 0x145ad698, 0x145ad698, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 
> 640x480xbgr888 */, (grub_uint32_t []) { 0x4af6b480, 0x923db79c, 0xfe8cc449, 
> 0x2647c755, 0x27ee23e3, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 
> 800x600xbgr888 */, (grub_uint32_t []) { 0x121d5e29, 0xf66c0aed, 0xdf138150, 
> 0x3b62d594, 0x8dec962a, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 
> 1024x768xbgr888 */, (grub_uint32_t []) { 0xae86a12c, 0x4dabbe89, 0x6d30e897, 
> 0x8e1df732, 0x2c0644ab, }, 5 },
> -  { "videotest", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 
> 640x480xbgr888 */, (grub_uint32_t []) { 0x2605d280, 0xc06e3172, 0xef3e6395, 
> 0x9558067, 0xb19ec65b, }, 5 },
> -  { "videotest", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 
> 800x600xbgr888 */, (grub_uint32_t []) { 0x9404ef3b, 0xa4fdf18, 0xad7ef98c, 
> 0x3335c9af, 0xe6f0c255, }, 5 },
> -  { "videotest", 1024, 768, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 
> 1024x768xbgr888 */, (grub_uint32_t []) { 0xa008b770, 0xb98eb0d8, 0x9304b820, 
> 0x8a82bf88, 0xc610a9d0, }, 5 },
> diff --git a/grub-core/tests/checksums.h b/grub-core/tests/checksums.h
> new file mode 100644
> index 0000000..93d100f
> --- /dev/null
> +++ b/grub-core/tests/checksums.h
> @@ -0,0 +1,27 @@
> +  { "videotest", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 
> 640x480xi16 */, (grub_uint32_t []) { 0x7f1853ba, 0x7f1853ba, 0x7f1853ba, 
> 0x7f1853ba, 0x7f1853ba, }, 5 },
> +  { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 
> 800x600xi16 */, (grub_uint32_t []) { 0xff1957f0, 0xff1957f0, 0xff1957f0, 
> 0xff1957f0, 0xff1957f0, }, 5 },
> +  { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 
> 1024x768xi16 */, (grub_uint32_t []) { 0xcb45d8c5, 0xcb45d8c5, 0xcb45d8c5, 
> 0xcb45d8c5, 0xcb45d8c5, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 
> 640x480xrgb555 */, (grub_uint32_t []) { 0x2c97569c, 0x2c97569c, 0x2c97569c, 
> 0x2c97569c, 0x2c97569c, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 
> 800x600xrgb555 */, (grub_uint32_t []) { 0x9bd7a3ac, 0x9bd7a3ac, 0x9bd7a3ac, 
> 0x9bd7a3ac, 0x9bd7a3ac, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 
> 1024x768xrgb555 */, (grub_uint32_t []) { 0xedbceb9c, 0xedbceb9c, 0xedbceb9c, 
> 0xedbceb9c, 0xedbceb9c, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 
> 640x480xrgb565 */, (grub_uint32_t []) { 0x3c2a42f1, 0x3c2a42f1, 0x3c2a42f1, 
> 0x3c2a42f1, 0x3c2a42f1, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 
> 800x600xrgb565 */, (grub_uint32_t []) { 0xb25ce62a, 0xb25ce62a, 0xb25ce62a, 
> 0xb25ce62a, 0xb25ce62a, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 
> 1024x768xrgb565 */, (grub_uint32_t []) { 0x66cee14c, 0x66cee14c, 0x66cee14c, 
> 0x66cee14c, 0x66cee14c, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 
> 640x480xrgb888 */, (grub_uint32_t []) { 0x61db45b7, 0x1d867efe, 0x99613325, 
> 0xe53c086c, 0x9543de62, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 
> 800x600xrgb888 */, (grub_uint32_t []) { 0xa46eb37f, 0xd2a59656, 0x49f8f92d, 
> 0x3f33dc04, 0x7aae512a, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 
> 1024x768xrgb888 */, (grub_uint32_t []) { 0xb864a496, 0x6c22313b, 0x1505f93d, 
> 0xc1436c90, 0xe74a6931, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 
> 640x480xrgb888 */, (grub_uint32_t []) { 0x2b154617, 0x692e98df, 0xaf62fb87, 
> 0xed59254f, 0x26164bc6, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 
> 800x600xrgb888 */, (grub_uint32_t []) { 0x3b0fbc56, 0xd9d57c0e, 0xfb564a17, 
> 0x198c8a4f, 0xbe502625, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 
> 1024x768xrgb888 */, (grub_uint32_t []) { 0x6e6c9b36, 0x4ae9f137, 0x27664f34, 
> 0x3e32535, 0xfc793332, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 
> 640x480xbgr555 */, (grub_uint32_t []) { 0x9056f776, 0x9056f776, 0x9056f776, 
> 0x9056f776, 0x9056f776, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 
> 800x600xbgr555 */, (grub_uint32_t []) { 0x2bde3c67, 0x2bde3c67, 0x2bde3c67, 
> 0x2bde3c67, 0x2bde3c67, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 
> 1024x768xbgr555 */, (grub_uint32_t []) { 0xb04615f3, 0xb04615f3, 0xb04615f3, 
> 0xb04615f3, 0xb04615f3, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 
> 640x480xbgr565 */, (grub_uint32_t []) { 0xba8df8dd, 0xba8df8dd, 0xba8df8dd, 
> 0xba8df8dd, 0xba8df8dd, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 
> 800x600xbgr565 */, (grub_uint32_t []) { 0x84ac1329, 0x84ac1329, 0x84ac1329, 
> 0x84ac1329, 0x84ac1329, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 
> 1024x768xbgr565 */, (grub_uint32_t []) { 0x145ad698, 0x145ad698, 0x145ad698, 
> 0x145ad698, 0x145ad698, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 
> 640x480xbgr888 */, (grub_uint32_t []) { 0x4af6b480, 0x923db79c, 0xfe8cc449, 
> 0x2647c755, 0x27ee23e3, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 
> 800x600xbgr888 */, (grub_uint32_t []) { 0x121d5e29, 0xf66c0aed, 0xdf138150, 
> 0x3b62d594, 0x8dec962a, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 
> 1024x768xbgr888 */, (grub_uint32_t []) { 0xae86a12c, 0x4dabbe89, 0x6d30e897, 
> 0x8e1df732, 0x2c0644ab, }, 5 },
> +  { "videotest", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 
> 640x480xbgr888 */, (grub_uint32_t []) { 0x2605d280, 0xc06e3172, 0xef3e6395, 
> 0x9558067, 0xb19ec65b, }, 5 },
> +  { "videotest", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 
> 800x600xbgr888 */, (grub_uint32_t []) { 0x9404ef3b, 0xa4fdf18, 0xad7ef98c, 
> 0x3335c9af, 0xe6f0c255, }, 5 },
> +  { "videotest", 1024, 768, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 
> 1024x768xbgr888 */, (grub_uint32_t []) { 0xa008b770, 0xb98eb0d8, 0x9304b820, 
> 0x8a82bf88, 0xc610a9d0, }, 5 },
> diff --git a/grub-core/tests/video_checksum.c 
> b/grub-core/tests/video_checksum.c
> index b2aab79..3c418f1 100644
> --- a/grub-core/tests/video_checksum.c
> +++ b/grub-core/tests/video_checksum.c
> @@ -339,7 +339,7 @@ struct checksum_desc
>  };
>  
>  const struct checksum_desc checksum_table[] = {
> -#include "checksums.c"
> +#include "checksums.h"
>  };
>  
>  void
> @@ -351,7 +351,7 @@ grub_video_checksum (const char *basename_in)
>  
>  #if defined (GENERATE_MODE) && defined (GRUB_MACHINE_EMU)
>    if (genfd < 0)
> -    genfd = open ("checksums.c", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | 
> S_IWUSR);
> +    genfd = open ("checksums.h", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | 
> S_IWUSR);
>    if (genfd >= 0)
>      {
>        char buf[400];

signature.asc
Description: OpenPGP digital signature