Update slang_version.h for KitKat and add new version number tests.
Change-Id: Ifd8bb0c6d48b280c80cf84dc4b1edcd1d95028b2
diff --git a/slang_version.h b/slang_version.h
index 3da104b..287dc3e 100644
--- a/slang_version.h
+++ b/slang_version.h
@@ -32,6 +32,7 @@
SLANG_JB_TARGET_API = 16,
SLANG_JB_MR1_TARGET_API = 17,
SLANG_JB_MR2_TARGET_API = 18,
+ SLANG_KK_TARGET_API = 19,
SLANG_MAXIMUM_TARGET_API = RS_VERSION
};
// Note that RS_VERSION is defined at build time (see Android.mk for details).
@@ -46,8 +47,8 @@
JB = 1600,
JB_MR1 = 1700,
JB_MR2 = 1800,
- KLP = 1900,
- CURRENT = KLP
+ KK = 1900,
+ CURRENT = KK
};
} // namespace SlangVersion
diff --git a/tests/P_set_target_api_18/IN_CTS b/tests/P_set_target_api_18/IN_CTS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_set_target_api_18/IN_CTS
diff --git a/tests/P_set_target_api_18/set_target_api_18.rs b/tests/P_set_target_api_18/set_target_api_18.rs
new file mode 100644
index 0000000..63ae635
--- /dev/null
+++ b/tests/P_set_target_api_18/set_target_api_18.rs
@@ -0,0 +1,21 @@
+// -target-api 18
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+#if RS_VERSION != 18
+#error Invalid RS_VERSION
+#endif
+
+#define RS_MSG_TEST_PASSED 100
+#define RS_MSG_TEST_FAILED 101
+
+void check(int version) {
+ if (version != RS_VERSION) {
+ rsDebug("version: ", version);
+ rsDebug("RS_VERSION: ", RS_VERSION);
+ rsSendToClient(RS_MSG_TEST_FAILED);
+ } else {
+ rsSendToClientBlocking(RS_MSG_TEST_PASSED);
+ }
+}
+
diff --git a/tests/P_set_target_api_18/stderr.txt.expect b/tests/P_set_target_api_18/stderr.txt.expect
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_set_target_api_18/stderr.txt.expect
diff --git a/tests/P_set_target_api_18/stdout.txt.expect b/tests/P_set_target_api_18/stdout.txt.expect
new file mode 100644
index 0000000..bcd61bc
--- /dev/null
+++ b/tests/P_set_target_api_18/stdout.txt.expect
@@ -0,0 +1 @@
+Generating ScriptC_set_target_api_18.java ...
diff --git a/tests/P_set_target_api_19/IN_CTS b/tests/P_set_target_api_19/IN_CTS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_set_target_api_19/IN_CTS
diff --git a/tests/P_set_target_api_19/set_target_api_19.rs b/tests/P_set_target_api_19/set_target_api_19.rs
new file mode 100644
index 0000000..f5811bd
--- /dev/null
+++ b/tests/P_set_target_api_19/set_target_api_19.rs
@@ -0,0 +1,21 @@
+// -target-api 19
+#pragma version(1)
+#pragma rs java_package_name(android.renderscript.cts)
+
+#if RS_VERSION != 19
+#error Invalid RS_VERSION
+#endif
+
+#define RS_MSG_TEST_PASSED 100
+#define RS_MSG_TEST_FAILED 101
+
+void check(int version) {
+ if (version != RS_VERSION) {
+ rsDebug("version: ", version);
+ rsDebug("RS_VERSION: ", RS_VERSION);
+ rsSendToClient(RS_MSG_TEST_FAILED);
+ } else {
+ rsSendToClientBlocking(RS_MSG_TEST_PASSED);
+ }
+}
+
diff --git a/tests/P_set_target_api_19/stderr.txt.expect b/tests/P_set_target_api_19/stderr.txt.expect
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/P_set_target_api_19/stderr.txt.expect
diff --git a/tests/P_set_target_api_19/stdout.txt.expect b/tests/P_set_target_api_19/stdout.txt.expect
new file mode 100644
index 0000000..5d92dd5
--- /dev/null
+++ b/tests/P_set_target_api_19/stdout.txt.expect
@@ -0,0 +1 @@
+Generating ScriptC_set_target_api_19.java ...