[PATCH i-g-t] tests/perf_pmu: Make the invalid-init failure place more obvious

[PATCH i-g-t] tests/perf_pmu: Make the invalid-init failure place more obvious

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Put the values into the assert so we know which step failed.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 tests/perf_pmu.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c
index 17f0afca6fe1..14eeee43c55c 100644
--- a/tests/perf_pmu.c
+++ b/tests/perf_pmu.c
@@ -736,7 +736,6 @@ queued(int gem_fd, const struct intel_execution_engine2 *e)
 static void invalid_init(void)
 {
 	struct perf_event_attr attr;
-	int pid, cpu;
 
 #define ATTR_INIT() \
 do { \
@@ -748,21 +747,15 @@ do { \
 
 	ATTR_INIT();
 	attr.sample_period = 100;
-	pid = -1;
-	cpu = 0;
-	igt_assert_eq(perf_event_open(&attr, pid, cpu, -1, 0), -1);
+	igt_assert_eq(perf_event_open(&attr, -1, 0, -1, 0), -1);
 	igt_assert_eq(errno, EINVAL);
 
 	ATTR_INIT();
-	pid = 0;
-	cpu = 0;
-	igt_assert_eq(perf_event_open(&attr, pid, cpu, -1, 0), -1);
+	igt_assert_eq(perf_event_open(&attr, 0, 0, -1, 0), -1);
 	igt_assert_eq(errno, EINVAL);
 
 	ATTR_INIT();
-	pid = -1;
-	cpu = 1;
-	igt_assert_eq(perf_event_open(&attr, pid, cpu, -1, 0), -1);
+	igt_assert_eq(perf_event_open(&attr, -1, 1, -1, 0), -1);
 	igt_assert_eq(errno, ENODEV);
 }
 
-- 
2.14.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] tests/perf_pmu: Make the invalid-init failure place more obvious

[Chris Wilson]

Quoting Tvrtko Ursulin (2017-11-22 20:49:58)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Put the values into the assert so we know which step failed.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for tests/perf_pmu: Make the invalid-init failure place more obvious

[Patchwork]

== Series Details ==

Series: tests/perf_pmu: Make the invalid-init failure place more obvious
URL   : https://patchwork.freedesktop.org/series/34255/
State : failure

== Summary ==

Series 34255 revision 1 was fully merged or fully failed: no git log

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx