* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "ccanlint.h"
+#include "../tools.h"
#include <unistd.h>
#include <getopt.h>
#include <stdarg.h>
{
fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-d <dirname>]\n"
" -v: verbose mode\n"
- " -s: simply give one line per FAIL and total score\n"
+ " -s: simply give one line summary\n"
" -d: use this directory instead of the current one\n"
" -n: do not compile anything\n",
name);
exit(1);
}
+#if 0
static void indent_print(const char *string)
{
while (*string) {
string += line;
}
}
+#endif
bool ask(const char *question)
{
}
static bool run_test(struct ccanlint *i,
- bool summary,
+ bool quiet,
unsigned int *score,
unsigned int *total_score,
struct manifest *m)
result = i->check(m);
if (!result) {
- if (verbose)
- printf(" %s: OK\n", i->name);
+ if (verbose) {
+ printf(" %s: OK", i->name);
+ if (i->total_score)
+ printf(" (+%u/%u)",
+ i->total_score, i->total_score);
+ printf("\n");
+ }
if (i->total_score) {
*score += i->total_score;
*total_score += i->total_score;
*total_score += i->total_score;
*score += this_score;
- if (summary) {
- printf("%s FAILED (%u/%u)\n",
+ if (verbose) {
+ printf(" %s: FAIL (+%u/%u)\n",
i->name, this_score, i->total_score);
-
- if (verbose)
- indent_print(i->describe(m, result));
- } else {
+ }
+ if (!quiet) {
printf("%s\n", i->describe(m, result));
if (i->handle)
{
int c;
bool summary = false;
- unsigned int score, total_score;
+ unsigned int score = 0, total_score = 0;
struct manifest *m;
struct ccanlint *i;
+ const char *prefix = "", *dir = ".";
/* I'd love to use long options, but that's not standard. */
/* FIXME: getopt_long ccan package? */
while ((c = getopt(argc, argv, "sd:vn")) != -1) {
switch (c) {
case 'd':
- if (chdir(optarg) != 0)
- err(1, "Changing into directory '%s'", optarg);
+ dir = optarg;
+ prefix = talloc_append_string(talloc_basename(NULL,
+ optarg),
+ ": ");
break;
case 's':
summary = true;
if (optind < argc)
usage(argv[0]);
- m = get_manifest(talloc_autofree_context());
+ m = get_manifest(talloc_autofree_context(), dir);
init_tests();
printf("Compulsory tests:\n");
while ((i = get_next_test(&compulsory_tests)) != NULL) {
- if (!run_test(i, summary, &score, &total_score, m))
- exit(1);
+ if (!run_test(i, summary, &score, &total_score, m)) {
+ errx(1, "%s%s failed", prefix, i->name);
+ }
}
if (verbose)
printf("\nNormal tests:\n");
- score = total_score = 0;
while ((i = get_next_test(&normal_tests)) != NULL)
run_test(i, summary, &score, &total_score, m);
- printf("Total score: %u/%u\n", score, total_score);
+ printf("%sTotal score: %u/%u\n", prefix, score, total_score);
return 0;
}