[PATCH i-g-t 0/3] Various small changes

[PATCH i-g-t 0/3] Various small changes

[Thomas Wood]

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(-)

-- 
1.8.5.3

[PATCH i-g-t 1/3] tests: add missing assertion

[Thomas Wood]

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 tests/pm_psr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/pm_psr.c b/tests/pm_psr.c
index def8e12..5d28c7a 100644
--- a/tests/pm_psr.c
+++ b/tests/pm_psr.c
@@ -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");
-- 
1.8.5.3

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

[Thomas Wood]

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 lib/drmtest.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 9f6e701..b8d3542 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -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);
 }
-- 
1.8.5.3

[PATCH i-g-t 3/3] lib: Add missing header to Makefile.sources

[Thomas Wood]

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

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 lib/Makefile.sources | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index 5072057..cac9d12 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -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		\
-- 
1.8.5.3

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

[Daniel Vetter]

On Tue, Mar 11, 2014 at 04:18:49PM +0000, Thomas Wood wrote:
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
> ---
>  lib/drmtest.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index 9f6e701..b8d3542 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -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

> +
>  	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);
>  }
> -- 
> 1.8.5.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch