Re: [Intel-gfx] [PATCH v2 i-g-t 1/1] tests: Fix seg fault when gem_mmap is run without specifying a subtest

[Thomas Wood]

On 18 August 2014 18:43, Mike Mason michael.w.ma...@intel.com wrote:
 gem_mmap seg faults when all tests are run together. This occurs because
 the new-object subtest closes the gem object, but short-mmap assumes
 it still exists. Thus gem_mmap__cpu() returns nil for addr and memset()
 seg faults. This patch makes new-object and short-mmap create and
 close their own gem objects.

Both patches (this one and scripts: Allow multiple -t and -x regular
expressions for run-tests.sh) merged, thanks.



 Signed-off-by: Mike Mason michael.w.ma...@intel.com
 ---
  tests/gem_mmap.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
 index 334bd76..33ffe45 100644
 --- a/tests/gem_mmap.c
 +++ b/tests/gem_mmap.c
 @@ -62,10 +62,8 @@ igt_main
 igt_assert(ret == -1  errno == ENOENT);
 }

 -   igt_fixture
 -   handle = gem_create(fd, OBJECT_SIZE);
 -
 igt_subtest(new-object) {
 +   handle = gem_create(fd, OBJECT_SIZE);
 arg.handle = handle;
 arg.offset = 0;
 arg.size = OBJECT_SIZE;
 @@ -94,9 +92,11 @@ igt_main

 igt_subtest(short-mmap) {
 igt_assert(OBJECT_SIZE  4096);
 +   handle = gem_create(fd, OBJECT_SIZE);
 addr = gem_mmap__cpu(fd, handle, 4096, PROT_WRITE);
 memset(addr, 0, 4096);
 munmap(addr, 4096);
 +   gem_close(fd, handle);
 }

 igt_fixture
 --
 1.9.1

 ___
 Intel-gfx mailing list
 Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v2 i-g-t 1/1] tests: Fix seg fault when gem_mmap is run without specifying a subtest

[Mike Mason]

gem_mmap seg faults when all tests are run together. This occurs because
the new-object subtest closes the gem object, but short-mmap assumes
it still exists. Thus gem_mmap__cpu() returns nil for addr and memset()
seg faults. This patch makes new-object and short-mmap create and
close their own gem objects.

Signed-off-by: Mike Mason michael.w.ma...@intel.com
---
 tests/gem_mmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
index 334bd76..33ffe45 100644
--- a/tests/gem_mmap.c
+++ b/tests/gem_mmap.c
@@ -62,10 +62,8 @@ igt_main
igt_assert(ret == -1  errno == ENOENT);
}
 
-   igt_fixture
-   handle = gem_create(fd, OBJECT_SIZE);
-
igt_subtest(new-object) {
+   handle = gem_create(fd, OBJECT_SIZE);
arg.handle = handle;
arg.offset = 0;
arg.size = OBJECT_SIZE;
@@ -94,9 +92,11 @@ igt_main
 
igt_subtest(short-mmap) {
igt_assert(OBJECT_SIZE  4096);
+   handle = gem_create(fd, OBJECT_SIZE);
addr = gem_mmap__cpu(fd, handle, 4096, PROT_WRITE);
memset(addr, 0, 4096);
munmap(addr, 4096);
+   gem_close(fd, handle);
}
 
igt_fixture
-- 
1.9.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx