Merge "Fix tests for 64-bit." into lmp-dev

7 files changed, 45 insertions, 16 deletions

diff --git a/tests/P_export_types/export_types.rs b/tests/P_export_types/export_types.rs
index 01a1205..90e06c8 100644
--- a/tests/P_export_types/export_types.rs
+++ b/tests/P_export_types/export_types.rs
@@ -20,13 +20,6 @@ rs_type type;
 rs_allocation allocation;
 rs_sampler sampler;
 rs_script script;
-rs_mesh mesh;
-rs_path path;
-rs_program_fragment program_fragment;
-rs_program_vertex program_vertex;
-rs_program_raster program_raster;
-rs_program_store program_store;
-rs_font font;
 rs_data_kind dk;
 rs_data_type dt;
 
diff --git a/tests/P_export_types_v20/export_types.rs b/tests/P_export_types_v20/export_types.rs
new file mode 100644
index 0000000..1edc9b4
--- /dev/null
+++ b/tests/P_export_types_v20/export_types.rs
@@ -0,0 +1,36 @@
+// -target-api 20
+#pragma version(1)
+#pragma rs java_package_name(foo)
+
+float f = 9.9999f;
+double d = 7.0;
+char c = 'a';
+unsigned char uc = 'a';
+short s = 1;
+unsigned short us = 1;
+int i = 5;
+unsigned int ui;
+long l = 13;
+unsigned long ul = 13;
+long long ll = 34;
+unsigned long long ull = 34;
+bool b = true;
+
+rs_element element;
+rs_type type;
+rs_allocation allocation;
+rs_sampler sampler;
+rs_script script;
+rs_mesh mesh;
+rs_path path;
+rs_program_fragment program_fragment;
+rs_program_vertex program_vertex;
+rs_program_raster program_raster;
+rs_program_store program_store;
+rs_font font;
+rs_data_kind dk;
+rs_data_type dt;
+
+float *fp;
+int *ip;
+
diff --git a/tests/P_export_types_v20/stderr.txt.expect b/tests/P_export_types_v20/stderr.txt.expect
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_export_types_v20/stderr.txt.expect
diff --git a/tests/P_export_types_v20/stdout.txt.expect b/tests/P_export_types_v20/stdout.txt.expect
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_export_types_v20/stdout.txt.expect
diff --git a/tests/P_refcount/refcount.rs b/tests/P_refcount/refcount.rs
index 3046dc4..96cb9d6 100644
--- a/tests/P_refcount/refcount.rs
+++ b/tests/P_refcount/refcount.rs
@@ -1,8 +1,8 @@
 #pragma version(1)
 #pragma rs java_package_name(foo)
 
-rs_font globalAlloc;
-rs_font globalAlloc2;
+rs_allocation globalAlloc;
+rs_allocation globalAlloc2;
 
 struct hasMatrix {
     rs_matrix3x3 m;
@@ -10,11 +10,11 @@ struct hasMatrix {
 
 static void foo() {
 
-    rs_font fontUninit;
-    rs_font fontArr[10];
-    fontUninit = globalAlloc;
+    rs_allocation allocUninit;
+    rs_allocation allocArr[10];
+    allocUninit = globalAlloc;
     for (int i = 0; i < 10; i++) {
-        fontArr[i] = globalAlloc;
+        allocArr[i] = globalAlloc;
     }
 
     return;
diff --git a/tests/P_unknown_function/stderr.txt.expect b/tests/P_unknown_function/stderr.txt.expect
index 63a6b97..901cd3b 100644
--- a/tests/P_unknown_function/stderr.txt.expect
+++ b/tests/P_unknown_function/stderr.txt.expect
@@ -1 +1 @@
-unknown_function.rs:6:5: warning: implicit declaration of function 'rsgProgramStoreGetDepthFunc' is invalid in C99
+unknown_function.rs:6:5: warning: implicit declaration of function 'bar' is invalid in C99
diff --git a/tests/P_unknown_function/unknown_function.rs b/tests/P_unknown_function/unknown_function.rs
index 00ec5e0..8127993 100644
--- a/tests/P_unknown_function/unknown_function.rs
+++ b/tests/P_unknown_function/unknown_function.rs
@@ -2,7 +2,7 @@
 #pragma rs java_package_name(foo)
 
 void foo() {
-    rs_program_store ps;
-    rsgProgramStoreGetDepthFunc(ps);
+    rs_allocation a;
+    bar(a);
 }