diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-05-15 09:47:21 +0200 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-05-15 10:04:24 +0200 |
| commit | 20f741e9a50889fb43625617a39182f35f9a7859 (patch) | |
| tree | 23f5a24b424746f24503aab758b4cdddae21895a /jack-tests/build | |
| parent | 075b0adab40d86425cf0dc4ac318ff4fe203bf89 (diff) | |
| download | toolchain_jack-20f741e9a50889fb43625617a39182f35f9a7859.tar.gz toolchain_jack-20f741e9a50889fb43625617a39182f35f9a7859.tar.bz2 toolchain_jack-20f741e9a50889fb43625617a39182f35f9a7859.zip | |
Modify script used to run jack tests with art
Change-Id: Ib1f42996f41fa978cfaee1bda2c3d04dc8f7eb80
Diffstat (limited to 'jack-tests/build')
| -rw-r--r-- | jack-tests/build/run-test.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jack-tests/build/run-test.mk b/jack-tests/build/run-test.mk index b491c235..540009e8 100644 --- a/jack-tests/build/run-test.mk +++ b/jack-tests/build/run-test.mk @@ -149,7 +149,7 @@ test-jack-$(JACKTEST_MODULE): $(JACKTEST_WITHDX_DEX) $(JACKTEST_WITHJACK_DEX) $( $(hide) mkdir -p /tmp/android-data/dalvik-cache $(hide) find /tmp/android-data/ -name "*$(subst /,@,$(PRIVATE_MODULE))*.dex" | xargs rm -f ifneq ($(ART_ANDROID_BUILD_TOP),) - ANDROID_BUILD_TOP=$(ART_ANDROID_BUILD_TOP) ANDROID_HOST_OUT=$(ART_ANDROID_BUILD_TOP)/out/host/linux-x86 $(ART_ANDROID_BUILD_TOP)/art/tools/art $(PRIVATE_DALVIK_FLAGS) -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) && echo $@ PASSED || (echo $@ FAILED with ART; exit 42) + ANDROID_BUILD_TOP=$(ART_ANDROID_BUILD_TOP) ANDROID_HOST_OUT=$(ART_ANDROID_BUILD_TOP)/out/host/linux-x86 $(ART_ANDROID_BUILD_TOP)/out/host/linux-x86/bin/art $(PRIVATE_DALVIK_FLAGS) -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) && echo $@ PASSED || (echo $@ FAILED with ART; exit 42) else $(hide) dalvik $(PRIVATE_DALVIK_FLAGS) -Xint:fast -classpath $(call normalize-path-list,$(PRIVATE_CLASSPATH)) org.junit.runner.JUnitCore $(PRIVATE_JUNIT) \ || (echo $@ FAILED with fast interpreter; exit 42) |