summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk4
-rw-r--r--build/Android.common.mk39
-rw-r--r--build/Android.gtest.mk4
-rw-r--r--build/Android.oattest.mk47
-rw-r--r--src/common_test.h2
-rw-r--r--src/heap.cc2
-rw-r--r--test/Fibonacci/Fibonacci.java18
7 files changed, 58 insertions, 58 deletions
diff --git a/Android.mk b/Android.mk
index c41d031d4b..fa8349b492 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,8 +65,8 @@ endif
ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core.jar $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
-ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_DEPENDENCIES) $(ART_HOST_TEST_EXECUTABLES) $(ART_TEST_OAT_FILES)
-ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TARGET_TEST_EXECUTABLES) $(ART_TEST_OAT_FILES)
+ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_DEPENDENCIES) $(ART_HOST_TEST_EXECUTABLES) $(ART_TEST_DEX_FILES) $(ART_TEST_OAT_FILES)
+ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TARGET_TEST_EXECUTABLES) $(ART_TEST_DEX_FILES) $(ART_TEST_OAT_FILES)
########################################################################
# host test targets
diff --git a/build/Android.common.mk b/build/Android.common.mk
index bd0e0be96f..d233ab0220 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -18,6 +18,10 @@
ART_CACHE_DIR := /data/art-cache
ART_CACHE_OUT := $(TARGET_OUT_DATA)/art-cache
+# directory used for gtests on device
+ART_NATIVETEST_DIR := /data/nativetest/art
+ART_NATIVETEST_OUT := $(TARGET_OUT_DATA_NATIVE_TESTS)/art
+
# directory used for tests on device
ART_TEST_DIR := /data/art-test
ART_TEST_OUT := $(TARGET_OUT_DATA)/art-test
@@ -254,37 +258,46 @@ TEST_HOST_SRC_FILES := \
$(TEST_COMMON_SRC_FILES) \
src/assembler_x86_test.cc
-# subdirectories of test/
+# subdirectories of test/ which are used as inputs for gtests
TEST_DEX_DIRECTORIES := \
AbstractMethod \
AllFields \
CreateMethodSignature \
ExceptionHandle \
- ExceptionTest \
- Fibonacci \
- GrowthLimit \
- HelloWorld \
IntMath \
Interfaces \
Main \
- MemUsage \
MyClass \
MyClassNatives \
Nested \
- ParallelGC \
ProtoCompare \
ProtoCompare2 \
- ReferenceMap \
- ReflectionTest \
- StackWalk \
- StackWalk2 \
StaticLeafMethods \
Statics \
StaticsFromCode \
- ThreadStress \
- Invoke \
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
+TEST_OAT_DIRECTORIES := \
+ Main \
+ HelloWorld \
+ Fibonacci \
+ \
+ ExceptionTest \
+ GrowthLimit \
+ IntMath \
+ Invoke \
+ MemUsage \
+ ParallelGC \
+ ReferenceMap \
+ ReflectionTest \
+ StackWalk \
+ ThreadStress
+
+# TODO: Enable when the StackWalk2 tests are passing
+# StackWalk2 \
+
ART_BUILD_TARGET := false
ART_BUILD_HOST := false
ifeq ($(ART_BUILD_TARGET_NDEBUG),true)
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index ca80ae8385..92fd96a6a9 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -55,7 +55,7 @@ define build-art-test
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz
LOCAL_STATIC_LIBRARIES := libgtest libgtest_main
- LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/art
+ LOCAL_MODULE_PATH := $(ART_NATIVETEST_OUT)
include $(BUILD_EXECUTABLE)
art_gtest_exe := $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE)
ART_TARGET_TEST_EXECUTABLES += $$(art_gtest_exe)
@@ -79,7 +79,7 @@ ifeq ($$(art_target_or_host),target)
$$(art_gtest_target): $$(art_gtest_exe) test-art-target-sync
adb shell touch $(ART_TEST_DIR)/$$@
adb shell rm $(ART_TEST_DIR)/$$@
- adb shell sh -c "/data/nativetest/art/$$(notdir $$<) && touch $(ART_TEST_DIR)/$$@"
+ adb shell sh -c "$(ART_NATIVETEST_DIR)/$$(notdir $$<) && touch $(ART_TEST_DIR)/$$@"
$(hide) (adb pull $(ART_TEST_DIR)/$$@ /tmp/ && echo $$@ PASSED) || (echo $$@ FAILED && exit 1)
$(hide) rm /tmp/$$@
diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk
index 86349a2c4f..49700f259c 100644
--- a/build/Android.oattest.mk
+++ b/build/Android.oattest.mk
@@ -18,19 +18,22 @@
ART_TEST_DEX_FILES :=
-# $(1): directory
+# $(1): module prefix
+# $(2): input test directory
+# $(3): output module path
define build-art-test-dex
include $(CLEAR_VARS)
- LOCAL_MODULE := art-test-dex-$(1)
- LOCAL_MODULE_TAGS := optional
- LOCAL_SRC_FILES := $(call all-java-files-under, test/$(1))
+ LOCAL_MODULE := $(1)-$(2)
+ LOCAL_MODULE_TAGS := tests
+ LOCAL_SRC_FILES := $(call all-java-files-under, test/$(2))
LOCAL_JAVA_LIBRARIES := core
LOCAL_NO_STANDARD_LIBRARIES := true
- LOCAL_MODULE_PATH := $(ART_TEST_OUT)
+ LOCAL_MODULE_PATH := $(3)
include $(BUILD_JAVA_LIBRARY)
- ART_TEST_DEX_FILES += $(TARGET_OUT_JAVA_LIBRARIES)/$$(LOCAL_MODULE).jar
+ ART_TEST_DEX_FILES += $(3)/$$(LOCAL_MODULE).jar
endef
-$(foreach dir,$(TEST_DEX_DIRECTORIES), $(eval $(call build-art-test-dex,$(dir))))
+$(foreach dir,$(TEST_DEX_DIRECTORIES), $(eval $(call build-art-test-dex,art-test-dex,$(dir),$(ART_NATIVETEST_OUT))))
+$(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call build-art-test-dex,oat-test-dex,$(dir),$(ART_TEST_OUT))))
########################################################################
@@ -49,10 +52,10 @@ ART_TEST_OAT_FILES :=
# $(1): directory
define build-art-test-oat
- $(call build-art-oat,$(ART_TEST_OUT)/art-test-dex-$(1).jar,$(ART_TEST_OUT)/art-test-dex-$(1).jar.oat,$(TARGET_CORE_IMG))
- ART_TEST_OAT_FILES += $(ART_TEST_OUT)/art-test-dex-$(1).jar.oat
+ $(call build-art-oat,$(ART_TEST_OUT)/oat-test-dex-$(1).jar,$(ART_TEST_OUT)/oat-test-dex-$(1).jar.oat,$(TARGET_CORE_IMG))
+ ART_TEST_OAT_FILES += $(ART_TEST_OUT)/oat-test-dex-$(1).jar.oat
endef
-$(foreach dir,$(TEST_DEX_DIRECTORIES), $(eval $(call build-art-test-oat,$(dir))))
+$(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call build-art-test-oat,$(dir))))
########################################################################
@@ -62,33 +65,15 @@ ART_TEST_OAT_TARGETS :=
# $(2): arguments
define declare-test-test-target
.PHONY: test-art-target-oat-$(1)
-test-art-target-oat-$(1): $(ART_TEST_OUT)/art-test-dex-$(1).jar test-art-target-sync
+test-art-target-oat-$(1): $(ART_TEST_OUT)/oat-test-dex-$(1).jar test-art-target-sync
adb shell touch $(ART_TEST_DIR)/test-art-target-oat-$(1)
adb shell rm $(ART_TEST_DIR)/test-art-target-oat-$(1)
- adb shell sh -c "oatexecd -Ximage:$(ART_TEST_DIR)/core.art -classpath $(ART_TEST_DIR)/art-test-dex-$(1).jar -Djava.library.path=$(ART_TEST_DIR) $(1) $(2) && touch $(ART_TEST_DIR)/test-art-target-oat-$(1)"
+ adb shell sh -c "oatexecd -Ximage:$(ART_TEST_DIR)/core.art -classpath $(ART_TEST_DIR)/oat-test-dex-$(1).jar -Djava.library.path=$(ART_TEST_DIR) $(1) $(2) && touch $(ART_TEST_DIR)/test-art-target-oat-$(1)"
$(hide) (adb pull $(ART_TEST_DIR)/test-art-target-oat-$(1) /tmp/ && echo test-art-target-oat-$(1) PASSED) || (echo test-art-target-oat-$(1) FAILED && exit 1)
$(hide) rm /tmp/test-art-target-oat-$(1)
ART_TEST_OAT_TARGETS += test-art-target-oat-$(1)
endef
-
-# Declare the simplest test first
-$(eval $(call declare-test-test-target,HelloWorld,))
-$(eval $(call declare-test-test-target,Fibonacci,10))
-
-# The rest are alphabetical
-$(eval $(call declare-test-test-target,ExceptionTest,))
-$(eval $(call declare-test-test-target,GrowthLimit,))
-$(eval $(call declare-test-test-target,IntMath,))
-$(eval $(call declare-test-test-target,Invoke,))
-$(eval $(call declare-test-test-target,MemUsage,))
-$(eval $(call declare-test-test-target,ParallelGC,))
-$(eval $(call declare-test-test-target,ReferenceMap,))
-$(eval $(call declare-test-test-target,ReflectionTest,))
-$(eval $(call declare-test-test-target,StackWalk,))
-$(eval $(call declare-test-test-target,ThreadStress,))
-
-# TODO: Enable when the StackWalk2 tests are passing
-# $(eval $(call declare-test-test-target,StackWalk2,))
+$(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call declare-test-test-target,$(dir))))
########################################################################
diff --git a/src/common_test.h b/src/common_test.h
index 11d31180c0..6adb02d821 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -406,7 +406,7 @@ class CommonTest : public testing::Test {
// on the host, just read target dex file
filename += getenv("ANDROID_PRODUCT_OUT");
}
- filename += "/data/art-test/art-test-dex-";
+ filename += "/data/nativetest/art/art-test-dex-";
filename += name;
filename += ".jar";
const DexFile* dex_file = DexFile::Open(filename, "");
diff --git a/src/heap.cc b/src/heap.cc
index 392db8a156..2451857b4a 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -381,7 +381,7 @@ Object* Heap::AllocateLocked(AllocSpace* space, size_t alloc_size) {
// free space is equal to the old free space + the
// utilization slop for the new allocation.
VLOG(gc) << "Grow heap (frag case) to " << PrettySize(new_footprint)
- << "for a " << PrettySize(alloc_size) << " allocation";
+ << " for a " << PrettySize(alloc_size) << " allocation";
return ptr;
}
diff --git a/test/Fibonacci/Fibonacci.java b/test/Fibonacci/Fibonacci.java
index bfe04aaded..9c943672a4 100644
--- a/test/Fibonacci/Fibonacci.java
+++ b/test/Fibonacci/Fibonacci.java
@@ -31,14 +31,16 @@ class Fibonacci {
}
public static void main(String[] args) {
+ String arg = (args.length > 0) ? args[0] : "10";
try {
- if (args.length == 1) {
- int x = Integer.parseInt(args[0]);
- int y = fibonacci(x); /* to warm up cache */
- System.out.printf("fibonacci(%d)=%d\n", x, y);
- y = fibonacci(x + 1);
- System.out.printf("fibonacci(%d)=%d\n", x + 1, y);
- }
- } catch (NumberFormatException ex) {}
+ int x = Integer.parseInt(arg);
+ int y = fibonacci(x); /* to warm up cache */
+ System.out.printf("fibonacci(%d)=%d\n", x, y);
+ y = fibonacci(x + 1);
+ System.out.printf("fibonacci(%d)=%d\n", x + 1, y);
+ } catch (NumberFormatException ex) {
+ System.err.println(ex);
+ System.exit(1);
+ }
}
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-26 00:33:44 +0000