summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2015-09-25 15:40:30 -0700
committer Mathieu Chartier <mathieuc@google.com> 2015-09-25 15:42:27 -0700
commit4450d9295a0713e30d2ac91b832f983d1c0c36fb (patch)
treeccc7bfc8579c73b74d7086fddc1ae19e942daa21
parentaff587c6ad1930d056e12c804cc330796eb9f244 (diff)
Fix tests 116 and 118 for no-prebuild
Added missing "JNI_OnLoad called" in the expected output. Change-Id: I619aae215c767bd75494933fd3480ec7e91b0570
-rw-r--r--test/116-nodex2oat/expected.txt3
-rw-r--r--test/118-noimage-dex2oat/expected.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/test/116-nodex2oat/expected.txt b/test/116-nodex2oat/expected.txt
index 05b1c2f387..157dfc4ea4 100644
--- a/test/116-nodex2oat/expected.txt
+++ b/test/116-nodex2oat/expected.txt
@@ -1,6 +1,9 @@
Run -Xnodex2oat
+JNI_OnLoad called
Has oat is false, is dex2oat enabled is false.
Run -Xdex2oat
+JNI_OnLoad called
Has oat is true, is dex2oat enabled is true.
Run default
+JNI_OnLoad called
Has oat is true, is dex2oat enabled is true.
diff --git a/test/118-noimage-dex2oat/expected.txt b/test/118-noimage-dex2oat/expected.txt
index 0103e899f6..166481e96a 100644
--- a/test/118-noimage-dex2oat/expected.txt
+++ b/test/118-noimage-dex2oat/expected.txt
@@ -1,11 +1,14 @@
Run -Xnoimage-dex2oat
+JNI_OnLoad called
Has image is false, is image dex2oat enabled is false, is BOOTCLASSPATH on disk is false.
testB18485243 PASS
Run -Xnoimage-dex2oat -Xno-dex-file-fallback
Failed to initialize runtime (check log for details)
Run -Ximage-dex2oat
+JNI_OnLoad called
Has image is true, is image dex2oat enabled is true, is BOOTCLASSPATH on disk is true.
testB18485243 PASS
Run default
+JNI_OnLoad called
Has image is true, is image dex2oat enabled is true, is BOOTCLASSPATH on disk is true.
testB18485243 PASS