diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-22 22:05:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-22 16:18:32 +0000 |
| commit | ddc211980aa2f6149905d8d26f67201ac8e400b3 (patch) | |
| tree | 2eb01b8a369ef5aa9a74f3518e6d12d64c8111fb | |
| parent | c389c97ca93b73b3cb380cedfe438d153b524225 (diff) | |
| parent | d2c0b097261f8c55139bfb6426c89f3d0f8deb8a (diff) | |
| download | art-ddc211980aa2f6149905d8d26f67201ac8e400b3.zip art-ddc211980aa2f6149905d8d26f67201ac8e400b3.tar.gz art-ddc211980aa2f6149905d8d26f67201ac8e400b3.tar.bz2 | |
Merge "Put oat test output on stderr."
| -rw-r--r-- | build/Android.common_test.mk | 2 | ||||
| -rw-r--r-- | test/Android.oat.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 4987567..620444a 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -66,7 +66,7 @@ define ART_TEST_FAILED (mkdir -p $(ART_HOST_TEST_DIR)/failed/ && touch $(ART_HOST_TEST_DIR)/failed/$(1) && \ echo $(ART_TEST_KNOWN_FAILING) | grep -q $(1) \ && (echo -e "$(1) \e[91mKNOWN FAILURE\e[0m") \ - || (echo -e "$(1) \e[91mFAILED\e[0m"))) + || (echo -e "$(1) \e[91mFAILED\e[0m" >&2 ))) endef # Define the command run on test success. $(1) is the name of the test. Executed by the shell. diff --git a/test/Android.oat.mk b/test/Android.oat.mk index a83c527..7a43575 100644 --- a/test/Android.oat.mk +++ b/test/Android.oat.mk @@ -96,7 +96,7 @@ $(3): test-art-target-sync (adb pull $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$(LOCAL_PID) $(ART_HOST_TEST_DIR)/android-data-$$@ \ && $$(call ART_TEST_PASSED,$$@)) \ || (([ ! -f $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt ] || \ - cat $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt) && $$(call ART_TEST_FAILED,$$@)) + cat $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt >&2 ) && $$(call ART_TEST_FAILED,$$@)) $$(hide) (echo $(MAKECMDGOALS) | grep -q $$@ && \ echo "run-test run as top-level target, removing test directory $(ART_HOST_TEST_DIR)" && \ rm -r $(ART_HOST_TEST_DIR)) || true @@ -219,7 +219,7 @@ $(3): $$(ART_TEST_HOST_OAT_$(1)_DEX) $(ART_TEST_HOST_OAT_DEPENDENCIES) > $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt 2>&1 \ && $$(call ART_TEST_PASSED,$$@) \ || (([ ! -f $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt ] || \ - cat $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt) && $$(call ART_TEST_FAILED,$$@)) + cat $(ART_HOST_TEST_DIR)/android-data-$$@/output.txt >&2 ) && $$(call ART_TEST_FAILED,$$@)) $$(hide) (echo $(MAKECMDGOALS) | grep -q $$@ && \ echo "run-test run as top-level target, removing test directory $(ART_HOST_TEST_DIR)" && \ rm -r $(ART_HOST_TEST_DIR)) || true |