On Thu, Sep 22, 2016 at 09:33:08PM -0600, Kevin Locke wrote: > Several of the EXECUTABLE tests depend on headers not available on > Windows. Mark these tests MAY_NOT_COMPILE to handle this. > > Signed-off-by: Kevin Locke <ke...@kevinlocke.name> > Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
Applying.
> ---
> tools/configurator/configurator.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/configurator/configurator.c
> b/tools/configurator/configurator.c
> index 7c4dd4a..31e3d11 100644
> --- a/tools/configurator/configurator.c
> +++ b/tools/configurator/configurator.c
> @@ -75,7 +75,7 @@ struct test {
> };
>
> static struct test tests[] = {
> - { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
> + { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL,
> NULL,
> "#include <sys/types.h>\n"
> "int main(void) {\n"
> " return sizeof(off_t) == 4 ? 0 : 1;\n"
> @@ -180,7 +180,7 @@ static struct test tests[] = {
> { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL,
> "int *foo = (int[]) { 1, 2, 3, 4 };\n"
> "return foo[0] ? 0 : 1;" },
> - { "HAVE_FCHDIR", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
> + { "HAVE_FCHDIR", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL,
> "#include <sys/types.h>\n"
> "#include <sys/stat.h>\n"
> "#include <fcntl.h>\n"
> @@ -201,7 +201,7 @@ static struct test tests[] = {
> " if (arg == 4)\n"
> " warnx(\"warn %u\", arg);\n"
> "}\n" },
> - { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
> + { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
> "HAVE_32BIT_OFF_T", NULL,
> "#define _FILE_OFFSET_BITS 64\n"
> "#include <sys/types.h>\n"
> @@ -247,7 +247,7 @@ static struct test tests[] = {
> "static void *func(int fd) {\n"
> " return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
> "}" },
> - { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
> + { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
> NULL, NULL,
> "#include <sys/types.h>\n"
> "#include <sys/stat.h>\n"
> "#include <fcntl.h>\n"
> @@ -332,7 +332,7 @@ static struct test tests[] = {
> "-Werror -fopenmp" },
> { "HAVE_VALGRIND_MEMCHECK_H", OUTSIDE_MAIN, NULL, NULL,
> "#include <valgrind/memcheck.h>\n" },
> - { "HAVE_UCONTEXT", DEFINES_EVERYTHING|EXECUTE,
> + { "HAVE_UCONTEXT", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
> NULL, NULL,
> "#include <ucontext.h>\n"
> "static int x = 0;\n"
> @@ -353,7 +353,7 @@ static struct test tests[] = {
> " return (x == 3) ? 0 : 1;\n"
> "}\n"
> },
> - { "HAVE_POINTER_SAFE_MAKECONTEXT", DEFINES_EVERYTHING|EXECUTE,
> + { "HAVE_POINTER_SAFE_MAKECONTEXT",
> DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE,
> "HAVE_UCONTEXT", NULL,
> "#include <stddef.h>\n"
> "#include <ucontext.h>\n"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
_______________________________________________ ccan mailing list ccan@lists.ozlabs.org https://lists.ozlabs.org/listinfo/ccan
