Mesa (9.2): r300g/compiler/tests: Fix segfault

Ian Romanick idr at kemper.freedesktop.org
Thu Aug 8 02:04:56 UTC 2013


Module: Mesa
Branch: 9.2
Commit: 12da1bcb3b3e9f859439a9aceff47ea04f3550c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12da1bcb3b3e9f859439a9aceff47ea04f3550c7

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Wed Aug  7 17:26:01 2013 -0700

r300g/compiler/tests: Fix segfault

CC: "9.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d691ba4d9412b68dd56a300549bafc733e1bb7ee)

---

 .../tests/radeon_compiler_optimize_tests.c         |    2 +-
 .../tests/radeon_compiler_regalloc_tests.c         |    4 ++--
 .../compiler/tests/radeon_compiler_util_tests.c    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_optimize_tests.c b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_optimize_tests.c
index 819fb6c..3244d93 100644
--- a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_optimize_tests.c
+++ b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_optimize_tests.c
@@ -80,7 +80,7 @@ static void test_runner_rc_optimize(struct test_result * result)
 
 unsigned radeon_compiler_optimize_run_tests()
 {
-	struct test tests[] = {
+	static struct test tests[] = {
 		{"rc_optimize() => peephole_mul_omod()", test_runner_rc_optimize},
 		{NULL, NULL}
 	};
diff --git a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c
index eeb6b07..511596c 100644
--- a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c
+++ b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c
@@ -91,8 +91,8 @@ static void tex_1d_swizzle(struct test_result *result)
 
 unsigned radeon_compiler_regalloc_run_tests()
 {
-	struct test tests[] = {
-		{"rc_pair_regalloc() => TEX 1D Swizzle - r300", tex_1d_swizzle},
+	static struct test tests[] = {
+		{"rc_pair_regalloc() => TEX 1D Swizzle - r300", tex_1d_swizzle },
 		{NULL, NULL}
 	};
 	return run_tests(tests);
diff --git a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_util_tests.c b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_util_tests.c
index 33b27fc..3e97594 100644
--- a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_util_tests.c
+++ b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_util_tests.c
@@ -96,7 +96,7 @@ static void test_runner_rc_inst_can_use_presub(struct test_result * result)
 
 unsigned radeon_compiler_util_run_tests()
 {
-	struct test tests[] = {
+	static struct test tests[] = {
 		{"rc_inst_can_use_presub()", test_runner_rc_inst_can_use_presub},
 		{NULL, NULL}
 	};




More information about the mesa-commit mailing list