Move ConcurrentGC to run-test.

Change-Id: Icf12321ece840c2edd4de6a80bb0d319317abc98

4 files changed, 5 insertions, 6 deletions

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 420ad33..2de72c6 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -431,7 +431,6 @@ TEST_OAT_DIRECTORIES := \
 	\
 	ExceptionTest \
 	GrowthLimit \
-	ConcurrentGC \
 	IntMath \
 	Invoke \
 	MemUsage \
diff --git a/test/102-concurrent-gc/expected.txt b/test/102-concurrent-gc/expected.txt
new file mode 100644
index 0000000..f75da10
--- /dev/null
+++ b/test/102-concurrent-gc/expected.txt
@@ -0,0 +1 @@
+Test complete
diff --git a/test/102-concurrent-gc/info.txt b/test/102-concurrent-gc/info.txt
new file mode 100644
index 0000000..b423127
--- /dev/null
+++ b/test/102-concurrent-gc/info.txt
@@ -0,0 +1,2 @@
+Test that attempts to hide objects from a concurrently running GC. The
+concurrent GC should locate the "hidden" objects through a write-barrier.
diff --git a/test/ConcurrentGC/ConcurrentGC.java b/test/102-concurrent-gc/src/Main.java
index 1a0fec8..1a9e88e 100644
--- a/test/ConcurrentGC/ConcurrentGC.java
+++ b/test/102-concurrent-gc/src/Main.java
@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import java.util.Random;
 
-public class ConcurrentGC {
+public class Main {
     private static final int buckets = 16 * 1024;
     private static final int bufferSize = 1024;
 
@@ -66,5 +62,6 @@ public class ConcurrentGC {
             }
         } catch (OutOfMemoryError e) {
         }
+        System.out.println("Test complete");
     }
 }