summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2013-01-10 19:46:57 -0800
committerIan Rogers <irogers@google.com>2013-01-10 19:57:48 -0800
commit9ac995bc84d396ed5a748b591a01ae0c43f4dbb3 (patch)
tree3aa415b31f8a39fa8dc79a23b0283ac29a03412d
parent0ab2080369f080c9fd7bd975bbece6d0b82e3b6b (diff)
downloadart-9ac995bc84d396ed5a748b591a01ae0c43f4dbb3.zip
art-9ac995bc84d396ed5a748b591a01ae0c43f4dbb3.tar.gz
art-9ac995bc84d396ed5a748b591a01ae0c43f4dbb3.tar.bz2
Move Fibonacci to run-test.
Change-Id: I52bc4e68f59da9d327d373a7cb81f5b960f5416e
-rw-r--r--build/Android.common.mk3
-rw-r--r--test/101-fibonacci/expected.txt2
-rw-r--r--test/101-fibonacci/info.txt1
-rw-r--r--test/101-fibonacci/src/Main.java (renamed from test/Fibonacci/Fibonacci.java)2
4 files changed, 5 insertions, 3 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 420ad33..8cefdee 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -423,11 +423,10 @@ TEST_DEX_DIRECTORIES := \
XandY
# subdirectories of test/ which are used with test-art-target-oat
-# Declare the simplest tests (Main, HelloWorld, and Fibonacci) first, the rest are alphabetical
+# Declare the simplest tests (Main, HelloWorld) first, the rest are alphabetical
TEST_OAT_DIRECTORIES := \
Main \
HelloWorld \
- Fibonacci \
\
ExceptionTest \
GrowthLimit \
diff --git a/test/101-fibonacci/expected.txt b/test/101-fibonacci/expected.txt
new file mode 100644
index 0000000..dcc3617
--- /dev/null
+++ b/test/101-fibonacci/expected.txt
@@ -0,0 +1,2 @@
+fibonacci(10)=55
+fibonacci(11)=89
diff --git a/test/101-fibonacci/info.txt b/test/101-fibonacci/info.txt
new file mode 100644
index 0000000..991511c
--- /dev/null
+++ b/test/101-fibonacci/info.txt
@@ -0,0 +1 @@
+Computes fibonacci.
diff --git a/test/Fibonacci/Fibonacci.java b/test/101-fibonacci/src/Main.java
index a5c4e4b..3773e1b 100644
--- a/test/Fibonacci/Fibonacci.java
+++ b/test/101-fibonacci/src/Main.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-class Fibonacci {
+class Main {
/*
// Iterative version