base64: fix for unsigned chars (e.g. ARM).

[ccan] / tools / ccanlint / tests / tests_compile.c

diff --git a/tools/ccanlint/tests/tests_compile.c b/tools/ccanlint/tests/tests_compile.c
index ee1a6b2c2e2a8da010764b081c5e14c90567e729..0bafcc64e5ddb6124d956eb265c24fe62eff7ce9 100644 (file)
--- a/tools/ccanlint/tests/tests_compile.c
+++ b/tools/ccanlint/tests/tests_compile.c
@@ -1,6 +1,5 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>

-#include <ccan/talloc/talloc.h>

 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>


@@ -17,7 +16,7 @@
 #include "reduce_features.h"
 #include "tests_compile.h"
 
 #include "reduce_features.h"
 #include "tests_compile.h"
 

-static const char *can_build(struct manifest *m)
+static const char *can_build(struct manifest *m UNNEEDED)

 {
        if (safe_mode)
                return "Safe mode enabled";
 {
        if (safe_mode)
                return "Safe mode enabled";


@@ -27,40 +26,54 @@ static const char *can_build(struct manifest *m)
 char *test_obj_list(const struct manifest *m, bool link_with_module,
                    enum compile_type ctype, enum compile_type own_ctype)
 {
 char *test_obj_list(const struct manifest *m, bool link_with_module,
                    enum compile_type ctype, enum compile_type own_ctype)
 {

-       char *list = talloc_strdup(m, "");
+       char *list = tal_strdup(m, "");

        struct ccan_file *i;
        struct manifest *subm;
 
        /* Objects from any other C files. */
        list_for_each(&m->other_test_c_files, i, list)
        struct ccan_file *i;
        struct manifest *subm;
 
        /* Objects from any other C files. */
        list_for_each(&m->other_test_c_files, i, list)

-               list = talloc_asprintf_append(list, " %s",
-                                             i->compiled[ctype]);
+               tal_append_fmt(&list, " %s", i->compiled[ctype]);

 
        /* Our own object files. */
        if (link_with_module)
                list_for_each(&m->c_files, i, list)
 
        /* Our own object files. */
        if (link_with_module)
                list_for_each(&m->c_files, i, list)

-                       list = talloc_asprintf_append(list, " %s",
-                                                     i->compiled[own_ctype]);
+                       tal_append_fmt(&list, " %s", i->compiled[own_ctype]);

 
 

-       /* Other ccan modules. */
+       /* Other ccan modules (normal depends). */

        list_for_each(&m->deps, subm, list) {
                if (subm->compiled[ctype])
        list_for_each(&m->deps, subm, list) {
                if (subm->compiled[ctype])

-                       list = talloc_asprintf_append(list, " %s",
-                                                     subm->compiled[ctype]);
+                       tal_append_fmt(&list, " %s", subm->compiled[ctype]);
+       }
+
+       /* Other ccan modules (test depends). */
+       list_for_each(&m->test_deps, subm, list) {
+               if (subm->compiled[ctype])
+                       tal_append_fmt(&list, " %s", subm->compiled[ctype]);

        }
 
        return list;
 }
 
        }
 
        return list;
 }
 

-char *lib_list(const struct manifest *m, enum compile_type ctype)
+char *test_lib_list(const struct manifest *m, enum compile_type ctype UNNEEDED)
+{
+       unsigned int i;
+       char **libs;
+       char *ret = tal_strdup(m, "");
+
+       libs = get_libs(m, m->dir, "testdepends", get_or_compile_info);
+       for (i = 0; libs[i]; i++)
+               tal_append_fmt(&ret, "-l%s ", libs[i]);
+       return ret;
+}
+
+static char *cflags_list(const struct manifest *m, const char *iflags)

 {
 {

-       unsigned int i, num;
-       char **libs = get_libs(m, m->dir, &num,
-                              &m->info_file->compiled[ctype]);
-       char *ret = talloc_strdup(m, "");
+       unsigned int i;
+       char *ret = tal_strdup(m, iflags);

 
 

-       for (i = 0; i < num; i++)
-               ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
+       char **flags = get_cflags(m, m->dir, get_or_compile_info);
+       for (i = 0; flags[i]; i++)
+               tal_append_fmt(&ret, " %s", flags[i]);

        return ret;
 }
 
        return ret;
 }
 


@@ -69,25 +82,25 @@ static bool compile(const void *ctx,
                    struct ccan_file *file,
                    bool fail,
                    bool link_with_module,
                    struct ccan_file *file,
                    bool fail,
                    bool link_with_module,

-                   bool keep,

                    enum compile_type ctype,
                    char **output)
 {
        char *fname, *flags;
 
                    enum compile_type ctype,
                    char **output)
 {
        char *fname, *flags;
 

-       flags = talloc_asprintf(ctx, "%s%s%s",
-                               fail ? "-DFAIL " : "",
-                               cflags,
-                               ctype == COMPILE_NOFEAT
-                               ? " "REDUCE_FEATURES_FLAGS : "");
+       flags = tal_fmt(ctx, "%s%s%s",
+                       fail ? "-DFAIL " : "",
+                       cflags,
+                       ctype == COMPILE_NOFEAT
+                       ? " "REDUCE_FEATURES_FLAGS : "");
+       flags = cflags_list(m, flags);

 
 

-       fname = maybe_temp_file(ctx, "", keep, file->fullname);
+       fname = temp_file(ctx, "", file->fullname);

        if (!compile_and_link(ctx, file->fullname, ccan_dir,
                              test_obj_list(m, link_with_module,
                                            ctype, ctype),
        if (!compile_and_link(ctx, file->fullname, ccan_dir,
                              test_obj_list(m, link_with_module,
                                            ctype, ctype),

-                             compiler, flags, lib_list(m, ctype), fname,
+                             compiler, flags, test_lib_list(m, ctype), fname,

                              output)) {
                              output)) {

-               talloc_free(fname);
+               tal_free(fname);

                return false;
        }
 
                return false;
        }
 


@@ -99,25 +112,25 @@ static void compile_async(const void *ctx,
                          struct manifest *m,
                          struct ccan_file *file,
                          bool link_with_module,
                          struct manifest *m,
                          struct ccan_file *file,
                          bool link_with_module,

-                         bool keep,

                          enum compile_type ctype,
                          unsigned int time_ms)
 {
        char *flags;
 
                          enum compile_type ctype,
                          unsigned int time_ms)
 {
        char *flags;
 

-       file->compiled[ctype] = maybe_temp_file(ctx, "", keep, file->fullname);
-       flags = talloc_asprintf(ctx, "%s%s",
-                               cflags,
-                               ctype == COMPILE_NOFEAT
-                               ? " "REDUCE_FEATURES_FLAGS : "");
+       file->compiled[ctype] = temp_file(ctx, "", file->fullname);
+       flags = tal_fmt(ctx, "%s%s",
+                       cflags,
+                       ctype == COMPILE_NOFEAT
+                       ? " "REDUCE_FEATURES_FLAGS : "");
+       flags = cflags_list(m, flags);

 
        compile_and_link_async(file, time_ms, file->fullname, ccan_dir,
                               test_obj_list(m, link_with_module, ctype, ctype),
 
        compile_and_link_async(file, time_ms, file->fullname, ccan_dir,
                               test_obj_list(m, link_with_module, ctype, ctype),

-                              compiler, flags, lib_list(m, ctype),
+                              compiler, flags, test_lib_list(m, ctype),

                               file->compiled[ctype]);
 }
 
                               file->compiled[ctype]);
 }
 

-static void compile_tests(struct manifest *m, bool keep,
+static void compile_tests(struct manifest *m,

                          struct score *score,
                          enum compile_type ctype,
                          unsigned int time_ms)
                          struct score *score,
                          enum compile_type ctype,
                          unsigned int time_ms)


@@ -130,7 +143,7 @@ static void compile_tests(struct manifest *m, bool keep,
        foreach_ptr(list, &m->compile_ok_tests, &m->run_tests, &m->api_tests) {
                list_for_each(list, i, list) {
                        compile_async(score, m, i,
        foreach_ptr(list, &m->compile_ok_tests, &m->run_tests, &m->api_tests) {
                list_for_each(list, i, list) {
                        compile_async(score, m, i,

-                                     list == &m->api_tests, keep,
+                                     list == &m->api_tests,

                                      ctype, time_ms);
                }
        }
                                      ctype, time_ms);
                }
        }


@@ -155,8 +168,7 @@ static void compile_tests(struct manifest *m, bool keep,
 
        /* For historical reasons, "fail" often means "gives warnings" */
        list_for_each(&m->compile_fail_tests, i, list) {
 
        /* For historical reasons, "fail" often means "gives warnings" */
        list_for_each(&m->compile_fail_tests, i, list) {

-               if (!compile(score, m, i, false, false, false,
-                            ctype, &cmdout)) {
+               if (!compile(score, m, i, false, false, ctype, &cmdout)) {

                        score_file_error(score, i, 0,
                                         "Compile without -DFAIL failed:\n%s",
                                         cmdout);
                        score_file_error(score, i, 0,
                                         "Compile without -DFAIL failed:\n%s",
                                         cmdout);


@@ -169,8 +181,7 @@ static void compile_tests(struct manifest *m, bool keep,
                                         cmdout);
                        return;
                }
                                         cmdout);
                        return;
                }

-               if (compile(score, m, i, true, false, false,
-                           ctype, &cmdout)
+               if (compile(score, m, i, true, false, ctype, &cmdout)

                    && streq(cmdout, "")) {
                        score_file_error(score, i, 0,
                                         "Compiled successfully with -DFAIL?");
                    && streq(cmdout, "")) {
                        score_file_error(score, i, 0,
                                         "Compiled successfully with -DFAIL?");


@@ -185,10 +196,9 @@ static void compile_tests(struct manifest *m, bool keep,
 
 /* FIXME: If we time out, set *timeleft to 0 */
 static void do_compile_tests(struct manifest *m,
 
 /* FIXME: If we time out, set *timeleft to 0 */
 static void do_compile_tests(struct manifest *m,

-                            bool keep,

                             unsigned int *timeleft, struct score *score)
 {
                             unsigned int *timeleft, struct score *score)
 {

-       compile_tests(m, keep, score, COMPILE_NORMAL, *timeleft);
+       compile_tests(m, score, COMPILE_NORMAL, *timeleft);

 }
 
 struct ccanlint tests_compile = {
 }
 
 struct ccanlint tests_compile = {


@@ -201,7 +211,7 @@ struct ccanlint tests_compile = {
 
 REGISTER_TEST(tests_compile);
 
 
 REGISTER_TEST(tests_compile);
 

-static const char *features_reduced(struct manifest *m)
+static const char *features_reduced(struct manifest *m UNNEEDED)

 {
        if (features_were_reduced)
                return NULL;
 {
        if (features_were_reduced)
                return NULL;


@@ -209,11 +219,10 @@ static const char *features_reduced(struct manifest *m)
 }
 
 static void do_compile_tests_without_features(struct manifest *m,
 }
 
 static void do_compile_tests_without_features(struct manifest *m,

-                                             bool keep,

                                              unsigned int *timeleft,
                                              struct score *score)
 {
                                              unsigned int *timeleft,
                                              struct score *score)
 {

-       compile_tests(m, keep, score, COMPILE_NOFEAT, *timeleft);
+       compile_tests(m, score, COMPILE_NOFEAT, *timeleft);

 }
 
 struct ccanlint tests_compile_without_features = {
 }
 
 struct ccanlint tests_compile_without_features = {