summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 420ad330c6..8cefdee4c8 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 0000000000..dcc3617068
--- /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 0000000000..991511c6ca
--- /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 a5c4e4b87e..3773e1b123 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