diff options
| author | Stephen Hines <srhines@google.com> | 2015-04-29 11:33:05 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2015-04-30 16:13:42 -0700 |
| commit | d2a9c5a9b43370497b760b28c92ff3661e921295 (patch) | |
| tree | 60d76c61573e5126771450e9abd10ff8c4fb10c3 | |
| parent | 4fea1505ac9a2ff2b476b855826f779e1b6a925e (diff) | |
| download | android_frameworks_compile_slang-d2a9c5a9b43370497b760b28c92ff3661e921295.tar.gz android_frameworks_compile_slang-d2a9c5a9b43370497b760b28c92ff3661e921295.tar.bz2 android_frameworks_compile_slang-d2a9c5a9b43370497b760b28c92ff3661e921295.zip | |
Fix llvm-rs-cc tests due to header changes.
We moved graphics types to the separate rs_graphics.rsh header, so we need
to include it when we want to use rs_font, etc. in our tests. Some tests
were modified to use more relevant RS object types, since we don't want
to rely on graphics types going forward.
Change-Id: I4a85d183747f980670b377c9df8b63c2bee0e164
| -rw-r--r-- | tests/F_incompatible_handles/incompatible_handles.rs | 4 | ||||
| -rw-r--r-- | tests/F_incompatible_handles/stderr.txt.expect | 2 | ||||
| -rw-r--r-- | tests/F_struct_array_copy/struct_array_copy.rs | 2 | ||||
| -rw-r--r-- | tests/F_union/union.rs | 4 | ||||
| -rw-r--r-- | tests/P_export_types_v20/export_types.rs | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/tests/F_incompatible_handles/incompatible_handles.rs b/tests/F_incompatible_handles/incompatible_handles.rs index e7ff6c2..13f24fd 100644 --- a/tests/F_incompatible_handles/incompatible_handles.rs +++ b/tests/F_incompatible_handles/incompatible_handles.rs @@ -3,6 +3,6 @@ void foo() { rs_allocation a; - rs_mesh m; - a = m; + rs_element e; + a = e; } diff --git a/tests/F_incompatible_handles/stderr.txt.expect b/tests/F_incompatible_handles/stderr.txt.expect index 64759c6..52f3994 100644 --- a/tests/F_incompatible_handles/stderr.txt.expect +++ b/tests/F_incompatible_handles/stderr.txt.expect @@ -1 +1 @@ -incompatible_handles.rs:7:5: error: assigning to 'rs_allocation' from incompatible type 'rs_mesh' +incompatible_handles.rs:7:5: error: assigning to 'rs_allocation' from incompatible type 'rs_element' diff --git a/tests/F_struct_array_copy/struct_array_copy.rs b/tests/F_struct_array_copy/struct_array_copy.rs index 485cb45..382d84e 100644 --- a/tests/F_struct_array_copy/struct_array_copy.rs +++ b/tests/F_struct_array_copy/struct_array_copy.rs @@ -19,7 +19,7 @@ struct myStruct { rs_allocation a; int i; - rs_font f[100]; + rs_element e[100]; }; struct myStruct mS; diff --git a/tests/F_union/union.rs b/tests/F_union/union.rs index c6d423c..a6fa48d 100644 --- a/tests/F_union/union.rs +++ b/tests/F_union/union.rs @@ -8,13 +8,13 @@ union u { static union u2 { int i; - rs_font f; + rs_element e; } myUnion2; void foo() { union iu { - rs_font f; + rs_element e; int i; } v; (void) v; diff --git a/tests/P_export_types_v20/export_types.rs b/tests/P_export_types_v20/export_types.rs index 1358b9f..61d55e1 100644 --- a/tests/P_export_types_v20/export_types.rs +++ b/tests/P_export_types_v20/export_types.rs @@ -2,6 +2,8 @@ #pragma version(1) #pragma rs java_package_name(foo) +#include "rs_graphics.rsh" + float f = 9.9999f; double d = 7.0; char c = 'a'; |