diff options
| author | Stephen Hines <srhines@google.com> | 2011-10-27 16:09:01 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2011-10-27 16:09:01 -0700 |
| commit | fbfd7f5fd97458b6b23437556025ac1d55e98fd4 (patch) | |
| tree | 594d4cdf4d88a90ee4f490385ca41e8e01fa3697 /tests | |
| parent | c86623eb960965b240bc5e929e760f6bbc1be544 (diff) | |
| parent | f736d5a12269e7e74740b130cdca98d9839b31e6 (diff) | |
| download | slang-fbfd7f5fd97458b6b23437556025ac1d55e98fd4.tar.gz | |
resolved conflicts for merge of f736d5a1 to ics-mr1
Change-Id: If31e6d49af2571458500f42f8cc2310758dfaa26
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/F_root_graphics_13/root_graphics_13.rs | 7 | ||||
| -rw-r--r-- | tests/F_root_graphics_13/stderr.txt.expect | 3 | ||||
| -rw-r--r-- | tests/F_root_graphics_13/stdout.txt.expect | 0 | ||||
| -rw-r--r-- | tests/P_root_graphics_13/root_graphics_13.rs | 9 | ||||
| -rw-r--r-- | tests/P_root_graphics_13/stderr.txt.expect | 0 | ||||
| -rw-r--r-- | tests/P_root_graphics_13/stdout.txt.expect | 1 |
6 files changed, 20 insertions, 0 deletions
diff --git a/tests/F_root_graphics_13/root_graphics_13.rs b/tests/F_root_graphics_13/root_graphics_13.rs new file mode 100644 index 0000000..c6c1fbd --- /dev/null +++ b/tests/F_root_graphics_13/root_graphics_13.rs @@ -0,0 +1,7 @@ +// -target-api 13 +#pragma version(1) +#pragma rs java_package_name(foo) + +int root(unsigned int launchID) { + return 10; +} diff --git a/tests/F_root_graphics_13/stderr.txt.expect b/tests/F_root_graphics_13/stderr.txt.expect new file mode 100644 index 0000000..5670930 --- /dev/null +++ b/tests/F_root_graphics_13/stderr.txt.expect @@ -0,0 +1,3 @@ +root_graphics_13.rs:5:5: error: compute root() is required to return a void type +root_graphics_13.rs:5:5: error: Compute root() must have at least one parameter for in or out +root_graphics_13.rs:5:5: error: Compute root() targeting SDK levels 11-13 may not skip parameters diff --git a/tests/F_root_graphics_13/stdout.txt.expect b/tests/F_root_graphics_13/stdout.txt.expect new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/F_root_graphics_13/stdout.txt.expect diff --git a/tests/P_root_graphics_13/root_graphics_13.rs b/tests/P_root_graphics_13/root_graphics_13.rs new file mode 100644 index 0000000..882bea1 --- /dev/null +++ b/tests/P_root_graphics_13/root_graphics_13.rs @@ -0,0 +1,9 @@ +// -target-api 13 +#pragma version(1) +#pragma rs java_package_name(foo) + +typedef int myInt; + +myInt root(myInt launchID) { + return 10; +} diff --git a/tests/P_root_graphics_13/stderr.txt.expect b/tests/P_root_graphics_13/stderr.txt.expect new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/P_root_graphics_13/stderr.txt.expect diff --git a/tests/P_root_graphics_13/stdout.txt.expect b/tests/P_root_graphics_13/stdout.txt.expect new file mode 100644 index 0000000..f61211e --- /dev/null +++ b/tests/P_root_graphics_13/stdout.txt.expect @@ -0,0 +1 @@ +Generating ScriptC_root_graphics_13.java ... |