Add 4 expanded test scenarios.

9 files changed, 131 insertions, 1 deletions

diff --git a/ashmemtest-expanded/test2.out b/ashmemtest-expanded/test2.out
new file mode 100644
index 0000000..14ec3e4
--- /dev/null
+++ b/ashmemtest-expanded/test2.out
@@ -0,0 +1,16 @@
+-> got 1000 pages
+-> unpin 0..100 OK ret 0
+-> unpin 200..300 OK ret 0
+-> unpin 400..500 OK ret 0
+-> unpin 600..700 OK ret 0
+-> unpin 800..900 OK ret 0
+-> pin 0..100 OK ret 1
+-> pin 100..200 OK ret 0
+-> pin 200..300 OK ret 1
+-> pin 300..400 OK ret 0
+-> pin 400..500 OK ret 1
+-> pin 500..600 OK ret 0
+-> pin 600..700 OK ret 1
+-> pin 700..800 OK ret 0
+-> pin 800..900 OK ret 1
+-> pin 900..1000 OK ret 0
diff --git a/ashmemtest-expanded/test2.txt b/ashmemtest-expanded/test2.txt
new file mode 100644
index 0000000..f9a80a0
--- /dev/null
+++ b/ashmemtest-expanded/test2.txt
@@ -0,0 +1,19 @@
+# More advanced test to call cache shrinker.
+
+getpages 1000
+unpin 0 100
+unpin 200 300
+unpin 400 500
+unpin 600 700
+unpin 800 900
+shrink
+pin 0 100
+pin 100 200
+pin 200 300
+pin 300 400
+pin 400 500
+pin 500 600
+pin 600 700
+pin 700 800
+pin 800 900
+pin 900 1000
diff --git a/ashmemtest-expanded/test3.out b/ashmemtest-expanded/test3.out
new file mode 100644
index 0000000..bf5bde3
--- /dev/null
+++ b/ashmemtest-expanded/test3.out
@@ -0,0 +1,17 @@
+-> got 1000 pages
+-> unpin 0..100 OK ret 0
+-> unpin 200..300 OK ret 0
+-> unpin 400..500 OK ret 0
+-> unpin 600..700 OK ret 0
+-> unpin 800..900 OK ret 0
+-> purge return 500 pages OK
+-> pin 0..100 OK ret 1
+-> pin 100..200 OK ret 0
+-> pin 200..300 OK ret 1
+-> pin 300..400 OK ret 0
+-> pin 400..500 OK ret 1
+-> pin 500..600 OK ret 0
+-> pin 600..700 OK ret 1
+-> pin 700..800 OK ret 0
+-> pin 800..900 OK ret 1
+-> pin 900..1000 OK ret 0
diff --git a/ashmemtest-expanded/test3.txt b/ashmemtest-expanded/test3.txt
new file mode 100644
index 0000000..90eb970
--- /dev/null
+++ b/ashmemtest-expanded/test3.txt
@@ -0,0 +1,20 @@
+# Like test 2, but use ASHMEM_PURGE_ALL_CACHES ioctl instead.
+# Make sure that purge returns 500 pages.
+
+getpages 1000
+unpin 0 100
+unpin 200 300
+unpin 400 500
+unpin 600 700
+unpin 800 900
+purge
+pin 0 100
+pin 100 200
+pin 200 300
+pin 300 400
+pin 400 500
+pin 500 600
+pin 600 700
+pin 700 800
+pin 800 900
+pin 900 1000
diff --git a/ashmemtest-expanded/test4.out b/ashmemtest-expanded/test4.out
new file mode 100644
index 0000000..c7d5549
--- /dev/null
+++ b/ashmemtest-expanded/test4.out
@@ -0,0 +1,17 @@
+-> got 100 pages
+-> unpin backward 90..80 OK
+-> unpin backward 70..60 OK
+-> unpin backward 50..40 OK
+-> unpin backward 30..20 OK
+-> unpin backward 10..0 OK
+-> purge return 50 pages OK
+-> pin 0..10 OK ret 1
+-> pin 10..20 OK ret 0
+-> pin 20..30 OK ret 1
+-> pin 30..40 OK ret 0
+-> pin 40..50 OK ret 1
+-> pin 50..60 OK ret 0
+-> pin 60..70 OK ret 1
+-> pin 70..80 OK ret 0
+-> pin 80..90 OK ret 1
+-> pin 90..100 OK ret 0
diff --git a/ashmemtest-expanded/test4.txt b/ashmemtest-expanded/test4.txt
new file mode 100644
index 0000000..0ad54e8
--- /dev/null
+++ b/ashmemtest-expanded/test4.txt
@@ -0,0 +1,19 @@
+# Go unpin backward, page-by-page, then check pin status normally.
+
+getpages 100
+unpin 90 80
+unpin 70 60
+unpin 50 40
+unpin 30 20
+unpin 10 0
+purge
+pin 0 10
+pin 10 20
+pin 20 30
+pin 30 40
+pin 40 50
+pin 50 60
+pin 60 70
+pin 70 80
+pin 80 90
+pin 90 100
diff --git a/ashmemtest-expanded/test5.out b/ashmemtest-expanded/test5.out
new file mode 100644
index 0000000..ceab4c3
--- /dev/null
+++ b/ashmemtest-expanded/test5.out
@@ -0,0 +1,6 @@
+-> got 1000 pages
+-> unpin 0..100 OK ret 0
+-> unpin 500..600 OK ret 0
+-> purge return 200 pages OK
+-> pin 0..500 OK ret 1
+-> pin 600..1000 OK ret 0
diff --git a/ashmemtest-expanded/test5.txt b/ashmemtest-expanded/test5.txt
new file mode 100644
index 0000000..fd86520
--- /dev/null
+++ b/ashmemtest-expanded/test5.txt
@@ -0,0 +1,8 @@
+# Check whether if some pages was purged, all range is ASHMEM_WAS_PURGED.
+
+getpages 1000
+unpin 0 100
+unpin 500 600
+purge
+pin 0 500
+pin 600 1000
diff --git a/product.mk b/product.mk
index 030aa6d..2f1f104 100644
--- a/product.mk
+++ b/product.mk
@@ -5,4 +5,12 @@ PRODUCT_COPY_FILES += \
 	external/linaro-android-kernel-test/ashmemtest-expanded/test0.txt:data/linaro-android-kernel-test/ashmemtest-expanded/test0.txt \
 	external/linaro-android-kernel-test/ashmemtest-expanded/test0.out:data/linaro-android-kernel-test/ashmemtest-expanded/test0.out \
 	external/linaro-android-kernel-test/ashmemtest-expanded/test1.txt:data/linaro-android-kernel-test/ashmemtest-expanded/test1.txt \
-	external/linaro-android-kernel-test/ashmemtest-expanded/test1.out:data/linaro-android-kernel-test/ashmemtest-expanded/test1.out
\ No newline at end of file
+	external/linaro-android-kernel-test/ashmemtest-expanded/test1.out:data/linaro-android-kernel-test/ashmemtest-expanded/test1.out \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test2.txt:data/linaro-android-kernel-test/ashmemtest-expanded/test2.txt \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test2.out:data/linaro-android-kernel-test/ashmemtest-expanded/test2.out \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test3.txt:data/linaro-android-kernel-test/ashmemtest-expanded/test3.txt \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test3.out:data/linaro-android-kernel-test/ashmemtest-expanded/test3.out \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test4.txt:data/linaro-android-kernel-test/ashmemtest-expanded/test4.txt \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test4.out:data/linaro-android-kernel-test/ashmemtest-expanded/test4.out \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test5.txt:data/linaro-android-kernel-test/ashmemtest-expanded/test5.txt \
+	external/linaro-android-kernel-test/ashmemtest-expanded/test5.out:data/linaro-android-kernel-test/ashmemtest-expanded/test5.out