flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 01:46:14 +00:00
Code Issues Releases Wiki Activity

lib: add a environment variable to control output

Browse Source 
Disable output of terminal control characters and progress meters when
IGT_PLAIN_OUTPUT is set in the environment.

Cc: Derek Morton <derek.j.morton@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2015-11-09 17:17:24 +00:00
parent fca7b1b5fd
commit 790f1f804b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/igt_aux.c
View File

@ -231,7 +231,7 @@ static void igt_interactive_info(const char *format, ...)
{ {
va_list args; va_list args;
if (!isatty(STDERR_FILENO)) if (!isatty(STDERR_FILENO) || __igt_plain_output)
return; return;
if (igt_log_level > IGT_LOG_INFO) if (igt_log_level > IGT_LOG_INFO)

23
lib/igt_core.c
View File

@ -227,6 +227,8 @@ static enum {
CONT = 0, SKIP, FAIL CONT = 0, SKIP, FAIL
} skip_subtests_henceforth = CONT; } skip_subtests_henceforth = CONT;
bool __igt_plain_output = false;
/* fork support state */ /* fork support state */
pid_t *test_children; pid_t *test_children;
int num_test_children; int num_test_children;
@ -523,11 +525,15 @@ static int common_init(int *argc, char **argv,
int extra_opt_count; int extra_opt_count;
int all_opt_count; int all_opt_count;
int ret = 0; int ret = 0;
char *env = getenv("IGT_LOG_LEVEL"); const char *env;
if (isatty(STDOUT_FILENO)) if (!isatty(STDOUT_FILENO) || getenv("IGT_PLAIN_OUTPUT"))
__igt_plain_output = true;
if (!__igt_plain_output)
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
env = getenv("IGT_LOG_LEVEL");
if (env) { if (env) {
if (strcmp(env, "debug") == 0) if (strcmp(env, "debug") == 0)
igt_log_level = IGT_LOG_DEBUG; igt_log_level = IGT_LOG_DEBUG;
@ -779,12 +785,10 @@ bool __igt_run_subtest(const char *subtest_name)
} }
if (skip_subtests_henceforth) { if (skip_subtests_henceforth) {
bool istty = isatty(STDOUT_FILENO);
printf("%sSubtest %s: %s%s\n", printf("%sSubtest %s: %s%s\n",
(istty) ? "\x1b[1m" : "", subtest_name, (!__igt_plain_output) ? "\x1b[1m" : "", subtest_name,
skip_subtests_henceforth == SKIP ? skip_subtests_henceforth == SKIP ?
"SKIP" : "FAIL", (istty) ? "\x1b[0m" : ""); "SKIP" : "FAIL", (!__igt_plain_output) ? "\x1b[0m" : "");
return false; return false;
} }
@ -828,14 +832,15 @@ static void exit_subtest(const char *result)
{ {
struct timespec now; struct timespec now;
double elapsed; double elapsed;
bool istty = isatty(STDOUT_FILENO);
gettime(&now); gettime(&now);
elapsed = now.tv_sec - subtest_time.tv_sec; elapsed = now.tv_sec - subtest_time.tv_sec;
elapsed += (now.tv_nsec - subtest_time.tv_nsec) * 1e-9; elapsed += (now.tv_nsec - subtest_time.tv_nsec) * 1e-9;
printf("%sSubtest %s: %s (%.3fs)%s\n", (istty) ? "\x1b[1m" : "", printf("%sSubtest %s: %s (%.3fs)%s\n",
in_subtest, result, elapsed, (istty) ? "\x1b[0m" : ""); (!__igt_plain_output) ? "\x1b[1m" : "",
in_subtest, result, elapsed,
(!__igt_plain_output) ? "\x1b[0m" : "");
fflush(stdout); fflush(stdout);
in_subtest = NULL; in_subtest = NULL;

2
lib/igt_core.h
View File

@ -45,6 +45,8 @@
extern const char* __igt_test_description __attribute__((weak)); extern const char* __igt_test_description __attribute__((weak));
extern bool __igt_plain_output;
/** /**
* IGT_TEST_DESCRIPTION: * IGT_TEST_DESCRIPTION: