summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2012-02-24 09:00:01 -0500
committerTom Stellard <[email protected]>2012-02-26 15:13:47 -0500
commitedf33079771d61b093c6bffd98094b197915d758 (patch)
treea4fc3952409202593e29a4f2a9bd0710a70bbd02
parent7acbbc07048d85ee16b15b48a00e232cd26e2322 (diff)
r300g: Reorganize the compiler unit tests
-rw-r--r--src/gallium/drivers/r300/compiler/tests/Makefile3
-rw-r--r--src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.c6
-rw-r--r--src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.h2
-rw-r--r--src/gallium/drivers/r300/compiler/tests/radeon_compiler_util_tests.c3
4 files changed, 12 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/compiler/tests/Makefile b/src/gallium/drivers/r300/compiler/tests/Makefile
index 6eda34a2c00..fe83e5d0c96 100644
--- a/src/gallium/drivers/r300/compiler/tests/Makefile
+++ b/src/gallium/drivers/r300/compiler/tests/Makefile
@@ -4,11 +4,12 @@ include $(TOP)/configs/current
CFLAGS += -Wall -Werror
### Basic defines ###
-TESTS = radeon_compiler_util_tests
+TESTS = r300_compiler_tests
TEST_SOURCES := $(TESTS:=.c)
SHARED_SOURCES = \
+ radeon_compiler_util_tests.c \
rc_test_helpers.c \
unit_test.c
diff --git a/src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.c b/src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.c
new file mode 100644
index 00000000000..01495b46986
--- /dev/null
+++ b/src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.c
@@ -0,0 +1,6 @@
+#include "r300_compiler_tests.h"
+
+int main(int argc, char ** argv)
+{
+ radeon_compiler_util_run_tests();
+}
diff --git a/src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.h b/src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.h
new file mode 100644
index 00000000000..0a22705af79
--- /dev/null
+++ b/src/gallium/drivers/r300/compiler/tests/r300_compiler_tests.h
@@ -0,0 +1,2 @@
+
+void radeon_compiler_util_run_tests(void);
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 a2e3f2ab2e5..5ef25962a56 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
@@ -5,6 +5,7 @@
#include "radeon_compiler_util.h"
#include "radeon_program.h"
+#include "r300_compiler_tests.h"
#include "rc_test_helpers.h"
#include "unit_test.h"
@@ -66,7 +67,7 @@ static void test_runner_rc_inst_can_use_presub(struct test_result * result)
"MAD temp[0].xyz, temp[2].xyz_, -temp[3].xxx_, input[5].xyz_;");
}
-int main(int argc, char ** argv)
+void radeon_compiler_util_run_tests()
{
struct test tests[] = {
{"rc_inst_can_use_presub()", test_runner_rc_inst_can_use_presub},