diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-02-23 19:59:16 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-02-23 19:59:16 +0530 |
| commit | fa142b03294ec863112ae85eb7bf9093586a2762 (patch) | |
| tree | 2295567173d314e1aec77460429724e93f983aff | |
| parent | 4dd2a76f47ba82985ad3c92626291e8766843b00 (diff) | |
Revert "test-art-target-test: Include libcore test"
This reverts commit 4dd2a76f47ba82985ad3c92626291e8766843b00.
| -rwxr-xr-x | setup-android.sh | 2 | ||||
| -rwxr-xr-x | test-art-target-test.sh | 19 |
2 files changed, 2 insertions, 19 deletions
diff --git a/setup-android.sh b/setup-android.sh index 928cd1d..8038df3 100755 --- a/setup-android.sh +++ b/setup-android.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -xe +set -e export LANG=C export PATH=$PWD/tests:$PATH diff --git a/test-art-target-test.sh b/test-art-target-test.sh index a41966c..3850912 100755 --- a/test-art-target-test.sh +++ b/test-art-target-test.sh @@ -71,14 +71,6 @@ make -j12 test-art-target-sync export ART_TEST_NO_SYNC=true -./art/tools/run-libcore-tests.sh --mode=device --variant=X64 > $WORKSPACE/build-logs-libcore-tests.txt 2>&1 - -if [[ $? -ne 0 ]]; then - echo "Error: *** libcore tests failed" - cat $WORKSPACE/build-logs-libcore-tests.txt - failed=1 -fi - make -j2 test-art-target-gtest64 > $WORKSPACE/build-logs-gtest-64.txt 2>&1 if [[ $? -ne 0 ]]; then @@ -162,14 +154,6 @@ make -j12 test-art-target-sync export ART_TEST_NO_SYNC=true -./art/tools/run-libcore-tests.sh --mode=device --variant=X32 >> $WORKSPACE/build-logs-libcore-tests.txt 2>&1 - -if [[ $? -ne 0 ]]; then - echo "Error: *** libcore tests failed" - cat $WORKSPACE/build-logs-libcore-tests.txt - failed=1 -fi - make -j2 test-art-target-gtest32 > $WORKSPACE/build-logs-gtest-32.txt 2>&1 if [[ $? -ne 0 ]]; then @@ -233,8 +217,7 @@ ccache -s [[ $JENKINS_MODE ]] && dmesg >> $WORKSPACE/device_log.txt if [[ $failed -ne 0 ]]; then - cat $WORKSPACE/build-logs-libcore-tests.txt | grep "FAIL " | sed "s/^[ \t]*//" | sed -e "s/ .*//g" > $WORKSPACE/failed-test.txt - cat $WORKSPACE/build-logs-32.txt | grep -i "FAILED!" >> $WORKSPACE/failed-test.txt + cat $WORKSPACE/build-logs-32.txt | grep -i "FAILED!" > $WORKSPACE/failed-test.txt cat $WORKSPACE/build-logs-64.txt | grep -i "FAILED!" >> $WORKSPACE/failed-test.txt grep " FAILED" $WORKSPACE/build-logs-32.txt | grep "^test" | sed -e "s/ FAILED//g" | grep gtest >> $WORKSPACE/failed-test.txt grep " FAILED" $WORKSPACE/build-logs-64.txt | grep "^test" | sed -e "s/ FAILED//g" | grep gtest >> $WORKSPACE/failed-test.txt |