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

tests: Run igt.cocci

Browse Source 
New stuff caught.

Plus manually simplify the massive igt_fail_on_f(file == NULL, ...) to
a simple igt_assert(file). We already print the errno (if
applicapable) and the condition, which is equally informative.

Cc: Yi Sun <yi.sun@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Wendy Wang <wendy.wang@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-07-10 20:04:19 +02:00
parent 329f7a3734
commit 282482db70
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/kms_plane.c
View File

@ -284,8 +284,7 @@ test_plane_panning_with_output(data_t *data,
drmModeModeInfo *mode;
igt_crc_t crc;
fprintf(stdout, "Testing connector %s using pipe %c plane %d\n",
igt_output_name(output), pipe_name(pipe), plane);
igt_info("Testing connector %s using pipe %c plane %d\n", igt_output_name(output), pipe_name(pipe), plane);
test_init(data, pipe);

8
tests/kms_universal_plane.c
View File

@ -62,9 +62,8 @@ functional_test_init(functional_test_t *test, igt_output_t *output, enum pipe pi
drmModeModeInfo *mode;
test->pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
if (!test->pipe_crc)
igt_skip("auto crc not supported on this connector with pipe %i\n",
pipe);
igt_skip_on_f(!test->pipe_crc,
"auto crc not supported on this connector with pipe %i\n", pipe);
igt_output_set_pipe(output, pipe);
@ -136,8 +135,7 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
igt_assert(data->display.has_universal_planes);
igt_skip_on(pipe >= display->n_pipes);
fprintf(stdout, "Testing connector %s using pipe %c\n",
igt_output_name(output), pipe_name(pipe));
igt_info("Testing connector %s using pipe %c\n", igt_output_name(output), pipe_name(pipe));
functional_test_init(&test, output, pipe);

11
tests/pm_rc6_residency.c
View File

@ -45,10 +45,7 @@ static unsigned int readit(const char *path)
FILE *file;
file = fopen(path, "r");
if (file == NULL) {
fprintf(stderr, "Couldn't open %s (%d)\n", path, errno);
abort();
}
igt_assert(file);
scanned = fscanf(file, "%u", &ret);
igt_assert(scanned == 1);
@ -113,7 +110,7 @@ static void rc6_residency_counter(int value[],const char *name_of_rc6_residency[
if( value [flag + 3] == 0){
tmp_support = 0;
printf("This machine doesn't support %s\n",name_of_rc6_residency[flag]);
igt_info("This machine doesn't support %s\n", name_of_rc6_residency[flag]);
}
else
tmp_support = 1;
@ -125,12 +122,12 @@ static void rc6_residency_counter(int value[],const char *name_of_rc6_residency[
flag_support = flag_support << 1;
}
printf("The residency counter: %f \n", counter_result);
igt_info("The residency counter: %f \n", counter_result);
igt_skip_on_f(flag_support == 0 , "This machine didn't entry any RC6 state.\n");
igt_assert_f((flag_counter != 0) && (counter_result <=1) , "Sysfs RC6 residency counter is inaccurate.\n");
printf("This machine entry %s state.\n", name_of_rc6_residency[(flag_counter / 2) - 1]);
igt_info("This machine entry %s state.\n", name_of_rc6_residency[(flag_counter / 2) - 1]);
}
static void rc6_residency_check(int value[])