Skip to contentSkip to conversation

Various small changes

PATCH In review Thomas Wood 2 participants 5 messages Mar 11, 2014 Library code

lore
Share & tools
lore
#0 lore raw

cover Various small changes

The following patches contain two small fixes and one enhancement for intel-gpu-tools.

Thomas Wood (3):
tests: add missing assertion
lib: print the name of the currently running subtest
lib: Add i915_pciids.h to Makefile.sources

 lib/Makefile.sources | 1 +
 lib/drmtest.c        | 5 ++++-
 tests/pm_psr.c       | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/3 tests: add missing assertion

---
 tests/pm_psr.c | 1 +
 1 file changed, 1 insertion(+)
tests/pm_psr.c +1 -0
index def8e12..5d28c7a 100644
@@ -57,6 +57,7 @@ static int get_perf(const char *path)
 	igt_assert(ret != 0);
 	enabled = strcmp(str, "yes") == 0;
 	ret = fscanf(file, "Performance_Counter: %i", &perf);
+	igt_assert(ret != 0);
 
 	if (!sink)
 	    igt_skip("This panel does not support PSR.\n");
Signature · 1 line
1.8.5.3
#2 lore raw

PATCH 2/3 lib: print the name of the currently running subtest

In reply to Thomas Wood
---
 lib/drmtest.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
lib/drmtest.c +4 -1
index 9f6e701..b8d3542 100644
@@ -1007,6 +1007,9 @@ bool __igt_run_subtest(const char *subtest_name)
 		return false;
 	}
 
+	printf("Subtest %s: ", subtest_name);
+	fflush(stdout);
+
 	return (in_subtest = subtest_name);
 }
 
@@ -1028,7 +1031,7 @@ static int igt_exitcode;
 static void exit_subtest(const char *) __attribute__((noreturn));
 static void exit_subtest(const char *result)
 {
-	printf("Subtest %s: %s\n", in_subtest, result);
+	printf("%s\n", result);
 	in_subtest = NULL;
 	longjmp(igt_subtest_jmpbuf, 1);
 }
Signature · 1 line
1.8.5.3
#3 lore raw

Re: [PATCH i-g-t 2/3] lib: print the name of the currently running subtest

Quoted 10 lines · Thomas Wood
---
 lib/drmtest.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
lib/drmtest.c +0 -0
index 9f6e701..b8d3542 100644

lib/drmtest.c bool __igt_run_subtest(const char *subtest_name) · line 1011

Quoted 5 lines
lib/drmtest.c +2 -0
@@ -1007,6 +1007,9 @@ bool __igt_run_subtest(const char *subtest_name)
 		return false;
 	}
 
+	printf("Subtest %s: ", subtest_name);
+	fflush(stdout);

A lot of subtest spam stdout quite a bit, so we'd need to instaed print start/stop markers - splitt up the lines like this will result in really ugly output. See e.g. kms_flip.
-Daniel

Quoted 20 lines
lib/drmtest.c +2 -1
+
 	return (in_subtest = subtest_name);
 }
 
@@ -1028,7 +1031,7 @@ static int igt_exitcode;
 static void exit_subtest(const char *) __attribute__((noreturn));
 static void exit_subtest(const char *result)
 {
-	printf("Subtest %s: %s\n", in_subtest, result);
+	printf("%s\n", result);
 	in_subtest = NULL;
 	longjmp(igt_subtest_jmpbuf, 1);
 }
Signature · 6 lines
1.8.5.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#4 lore raw

PATCH 3/3 lib: Add missing header to Makefile.sources

In reply to Thomas Wood

i915_pciids.h was missing from Makefile.sources, which caused distcheck to fail.

---
 lib/Makefile.sources | 1 +
 1 file changed, 1 insertion(+)
lib/Makefile.sources +1 -0
index 5072057..cac9d12 100644
@@ -5,6 +5,7 @@ libintel_tools_la_SOURCES = 	\
 	i830_reg.h		\
 	i915_3d.h		\
 	i915_reg.h		\
+	i915_pciids.h		\
 	igt_debugfs.c		\
 	igt_debugfs.h		\
 	igt_display.c		\
Signature · 1 line
1.8.5.3