Revert "tests: Run igt.cocci over tests"

This reverts commit 6903ab04e5f9048e3932eb3225e94b6a228681ba.

The igt_assert conversion rule is broken and doesn't invert the check
as it should.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-06-13 18:03:50 +02:00
parent bfede4ed2b
commit ac0e606677
2 changed files with 12 additions and 6 deletions

View File

@ -118,11 +118,17 @@ static void _assert_dfs_entry(const char *fname, const char *s, bool inverse)
read_dfs(fname, tmp, l + 1);
if (!inverse) {
igt_assert_f(strncmp(tmp, s, l) != 0,
"contents of %s: '%s' (expected '%s')\n", fname, tmp, s);
if (strncmp(tmp, s, l) != 0) {
fprintf(stderr, "contents of %s: '%s' (expected '%s')\n",
fname, tmp, s);
igt_fail(1);
}
} else {
igt_assert_f(strncmp(tmp, s, l) == 0,
"contents of %s: '%s' (expected not '%s'\n", fname, tmp, s);
if (strncmp(tmp, s, l) == 0) {
fprintf(stderr, "contents of %s: '%s' (expected not '%s'\n",
fname, tmp, s);
igt_fail(1);
}
}
}

View File

@ -269,8 +269,8 @@ static bool psr_sink_support(data_t *data)
igt_require(file);
ret = fscanf(file, "Sink_Support: %s\n", str);
igt_skip_on_f(ret == 0,
"i915_edp_psr_status format not supported by this test case\n");
if (ret == 0)
igt_skip("i915_edp_psr_status format not supported by this test case\n");
fclose(file);
return strcmp(str, "yes") == 0;