Use color codes to mark OK, warn, and FAIL messages with green, bold,
and bright red accents, respectively.
Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
---
utils/v4l2-compliance/v4l2-compliance.1.in | 5 +++
utils/v4l2-compliance/v4l2-compliance.cpp | 37 ++++++++++++++++++++--
utils/v4l2-compliance/v4l2-compliance.h | 15 +++++++--
3 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/utils/v4l2-compliance/v4l2-compliance.1.in b/utils/v4l2-compliance/v4l2-compliance.1.in
index 77b84ba6022f..39f0229d7af1 100644
--- a/utils/v4l2-compliance/v4l2-compliance.1.in
+++ b/utils/v4l2-compliance/v4l2-compliance.1.in
@@ -167,6 +167,11 @@ signal is present on all inputs or that all outputs are hooked up.
Exit this application when the first failure occurs instead of continuing
with a possible inconsistent state.
.TP
+\fB\-C\fR, \fB\-\-color\fR \fI<when>\fR
+Highlight OK/warn/fail/FAIL strings with colors. OK is marked green, warn is
+marked bold, and fail/FAIL are marked bright red if enabled. \fI<when>\fR can
+be \fIalways\fR, \fInever\fR, or \fIauto\fR (the default).
+.TP
\fB\-n\fR, \fB\-\-no\-warnings\fR
Turn off warning messages. They are still counted in the summary, but you won't see them.
.TP
diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp
index f7611d75cb1b..e5bafc0738ea 100644
--- a/utils/v4l2-compliance/v4l2-compliance.cpp
+++ b/utils/v4l2-compliance/v4l2-compliance.cpp
@@ -54,6 +54,7 @@
enum Option {
OptStreamAllIO = 'a',
OptStreamAllColorTest = 'c',
+ OptColor = 'C',
OptSetDevice = 'd',
OptSetExpBufDevice = 'e',
OptExitOnFail = 'E',
@@ -89,6 +90,7 @@ static int grand_total, grand_ok, grand_warnings;
bool show_info;
bool no_progress;
bool show_warnings = true;
+bool show_colors;
bool exit_on_fail;
bool exit_on_warn;
bool is_vivid;
@@ -135,6 +137,7 @@ static struct option long_options[] = {
{"media-bus-info", required_argument, 0, OptMediaBusInfo},
{"help", no_argument, 0, OptHelp},
{"verbose", no_argument, 0, OptVerbose},
+ {"color", required_argument, 0, OptColor},
{"no-warnings", no_argument, 0, OptNoWarnings},
{"no-progress", no_argument, 0, OptNoProgress},
{"exit-on-fail", no_argument, 0, OptExitOnFail},
@@ -234,6 +237,8 @@ static void usage(void)
printf(" then this defaults to 90%%.\n");
printf(" -E, --exit-on-fail Exit on the first fail.\n");
printf(" -h, --help Display this help message.\n");
+ printf(" -C, --color <when> Highlight OK/warn/fail/FAIL strings with colors\n");
+ printf(" <when> can be set to always, never, or auto (the default)\n");
printf(" -n, --no-warnings Turn off warning messages.\n");
printf(" -P, --no-progress Turn off progress messages.\n");
printf(" -T, --trace Trace all called ioctls.\n");
@@ -250,15 +255,17 @@ const char *ok(int res)
static char buf[100];
if (res == ENOTTY) {
- strcpy(buf, "OK (Not Supported)");
+ strcpy(buf, show_colors ?
+ COLOR_GREEN("OK") " (Not Supported)" :
+ "OK (Not Supported)");
res = 0;
} else {
- strcpy(buf, "OK");
+ strcpy(buf, show_colors ? COLOR_GREEN("OK") : "OK");
}
tests_total++;
if (res) {
app_result = res;
- sprintf(buf, "FAIL");
+ sprintf(buf, show_colors ? COLOR_RED("FAIL") : "FAIL");
} else {
tests_ok++;
}
@@ -1432,6 +1439,7 @@ int main(int argc, char **argv)
media_type type = MEDIA_TYPE_UNKNOWN;
struct node expbuf_node;
std::string media_bus_info;
+ const char *env_media_apps_color = getenv("MEDIA_APPS_COLOR");
/* command args */
int ch;
@@ -1461,6 +1469,17 @@ int main(int argc, char **argv)
printf("Running on 2.6.%d\n", kernel_version);
printf("\n");
+ if (!env_media_apps_color || !strcmp(env_media_apps_color, "auto"))
+ show_colors = isatty(STDOUT_FILENO);
+ else if (!strcmp(env_media_apps_color, "always"))
+ show_colors = true;
+ else if (!strcmp(env_media_apps_color, "never"))
+ show_colors = false;
+ else {
+ fprintf(stderr,
+ "v4l2-compliance: invalid value for MEDIA_APPS_COLOR environment variable\n");
+ }
+
for (i = 0; long_options[i].name; i++) {
if (!isalpha(long_options[i].val))
continue;
@@ -1591,6 +1610,18 @@ int main(int argc, char **argv)
}
}
break;
+ case OptColor:
+ if (!strcmp(optarg, "always"))
+ show_colors = true;
+ else if (!strcmp(optarg, "never"))
+ show_colors = false;
+ else if (!strcmp(optarg, "auto"))
+ show_colors = isatty(STDOUT_FILENO);
+ else {
+ usage();
+ exit(1);
+ }
+ break;
case OptNoWarnings:
show_warnings = false;
break;
diff --git a/utils/v4l2-compliance/v4l2-compliance.h b/utils/v4l2-compliance/v4l2-compliance.h
index f7e1ea5d7124..152a6c6d9c76 100644
--- a/utils/v4l2-compliance/v4l2-compliance.h
+++ b/utils/v4l2-compliance/v4l2-compliance.h
@@ -50,6 +50,7 @@
#endif
extern bool show_info;
+extern bool show_colors;
extern bool show_warnings;
extern bool no_progress;
extern bool exit_on_fail;
@@ -185,17 +186,24 @@ private:
std::set<int> fhs;
};
+#define COLOR_GREEN(s) "\033[32m" s "\033[0m"
+#define COLOR_RED(s) "\033[1;31m" s "\033[0m"
+#define COLOR_BOLD(s) "\033[1m" s "\033[0m"
+
#define info(fmt, args...) \
do { \
if (show_info) \
- printf("\t\tinfo: " fmt, ##args); \
+ printf("\t\tinfo: " fmt, ##args); \
} while (0)
#define warn(fmt, args...) \
do { \
warnings++; \
if (show_warnings) \
- printf("\t\twarn: %s(%d): " fmt, __FILE__, __LINE__, ##args); \
+ printf("\t\t%s: %s(%d): " fmt, \
+ show_colors ? \
+ COLOR_BOLD("warn") : "warn", \
+ __FILE__, __LINE__, ##args); \
if (exit_on_warn) \
exit(1); \
} while (0)
@@ -218,7 +226,8 @@ private:
#define fail(fmt, args...) \
({ \
- printf("\t\tfail: %s(%d): " fmt, __FILE__, __LINE__, ##args); \
+ printf("\t\t%s: %s(%d): " fmt, show_colors ? \
+ COLOR_RED("fail") : "fail", __FILE__, __LINE__, ##args); \
if (exit_on_fail) \
exit(1); \
1; \
--
2.20.1
