summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2010-12-10 14:22:05 -0800
committerStephen Hines <srhines@google.com>2010-12-10 15:27:35 -0800
commitcfcea7a1d068a74660dc2dc4fde4f4f6b40fdd53 (patch)
tree8df7d58eeb9b1e6a4bcce38d4e6a0ae5c5232b79 /libs/rs
parentaa85a4c8b7abf82c54ecbad29e4266581c65c3f9 (diff)
downloadframeworks_base-cfcea7a1d068a74660dc2dc4fde4f4f6b40fdd53.zip
frameworks_base-cfcea7a1d068a74660dc2dc4fde4f4f6b40fdd53.tar.gz
frameworks_base-cfcea7a1d068a74660dc2dc4fde4f4f6b40fdd53.tar.bz2
Remove vector array test from RSTest.
This test will soon yield an appropriate compile-time error. Change-Id: I8f9bef7c4c6f954753268a2c1816337f347eae06
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java1
-rw-r--r--libs/rs/java/tests/src/com/android/rs/test/UT_vector_array.java40
-rw-r--r--libs/rs/java/tests/src/com/android/rs/test/vector_array.rs49
3 files changed, 0 insertions, 90 deletions
diff --git a/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java b/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
index 11b0fcd..c1f652f 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
+++ b/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
@@ -64,7 +64,6 @@ public class RSTestCore {
unitTests.add(new UT_primitives(this, mRes));
unitTests.add(new UT_rsdebug(this, mRes));
unitTests.add(new UT_rstypes(this, mRes));
- unitTests.add(new UT_vector_array(this, mRes));
unitTests.add(new UT_fp_mad(this, mRes));
/*
unitTests.add(new UnitTest(null, "<Pass>", 1));
diff --git a/libs/rs/java/tests/src/com/android/rs/test/UT_vector_array.java b/libs/rs/java/tests/src/com/android/rs/test/UT_vector_array.java
deleted file mode 100644
index 6798781..0000000
--- a/libs/rs/java/tests/src/com/android/rs/test/UT_vector_array.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.rs.test;
-
-import android.content.res.Resources;
-import android.renderscript.*;
-
-public class UT_vector_array extends UnitTest {
- private Resources mRes;
-
- protected UT_vector_array(RSTestCore rstc, Resources res) {
- super(rstc, "Vector Array");
- mRes = res;
- }
-
- public void run() {
- RenderScript pRS = RenderScript.create();
- ScriptC_vector_array s = new ScriptC_vector_array(pRS, mRes, R.raw.vector_array);
- pRS.setMessageHandler(mRsMessage);
- s.invoke_vector_array_test();
- pRS.finish();
- waitForMessage();
- pRS.destroy();
- }
-}
-
diff --git a/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs b/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs
deleted file mode 100644
index 49e38c1..0000000
--- a/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) 2009 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "shared.rsh"
-
-typedef struct float3Struct{
- float3 arr[2];
-} float3Struct;
-
-float3Struct f;
-
-bool size_test() {
- bool failed = false;
- int expectedSize = 2 * 3 * (int) sizeof(float);
- int actualSize = (int) sizeof(f);
-
- rsDebug("Size of struct { float3 arr[2]; } (expected):", expectedSize);
- rsDebug("Size of struct { float3 arr[2]; } (actual) :", actualSize);
-
- if (expectedSize != actualSize) {
- failed = true;
- }
-
- return failed;
-}
-
-void vector_array_test() {
- bool failed = false;
- failed |= size_test();
-
- if (failed) {
- rsSendToClientBlocking(RS_MSG_TEST_FAILED);
- }
- else {
- rsSendToClientBlocking(RS_MSG_TEST_PASSED);
- }
-}
-