diff options
| author | Neil Fuller <nfuller@google.com> | 2015-03-13 14:22:11 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2015-03-26 15:18:19 +0000 |
| commit | 56128c517866f88adb427d0931777814e24ffe1f (patch) | |
| tree | fbe26a2ad0bfaf0700569b7764aab7dcf9943e54 /core/tasks/cts.mk | |
| parent | 5d60719e42fdc0d007920d946f1c1bb440cedab7 (diff) | |
| download | build-56128c517866f88adb427d0931777814e24ffe1f.zip build-56128c517866f88adb427d0931777814e24ffe1f.tar.gz build-56128c517866f88adb427d0931777814e24ffe1f.tar.bz2 | |
Addition of a CTS suite for tzdata update code
Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
Diffstat (limited to 'core/tasks/cts.mk')
| -rw-r--r-- | core/tasks/cts.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 2ce5dbc..1fdb296 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -50,6 +50,10 @@ CTS_CORE_CASE_LIST := \ android.core.tests.libcore.package.okhttp \ android.core.tests.runner +# Additional CTS packages for code under libcore +CTS_CORE_CASE_LIST += \ + android.core.tests.libcore.package.tzdata + # The list of test packages that apache-harmony-tests (external/apache-harmony/Android.mk) # is split into. CTS_CORE_CASE_LIST += \ @@ -128,8 +132,10 @@ JUNIT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-junit,,CO CORETESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON) JSR166TESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,jsr166-tests,,COMMON) CONSCRYPTTESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,conscrypt-tests,,COMMON) +TZDATAUPDATETESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,tzdata_update-tests,,COMMON) -GEN_CLASSPATH := $(CORE_INTERMEDIATES)/classes.jar:$(CONSCRYPT_INTERMEDIATES)/classes.jar:$(BOUNCYCASTLE_INTERMEDIATES)/classes.jar:$(APACHEXML_INTERMEDIATES)/classes.jar:$(APACHEHARMONYTESTS_INTERMEDIATES)/classes.jar:$(OKHTTP_INTERMEDIATES)/classes.jar:$(OKHTTPTESTS_INTERMEDIATES)/classes.jar:$(OKHTTP_REPACKAGED_INTERMEDIATES)/classes.jar:$(JUNIT_INTERMEDIATES)/classes.jar:$(SQLITEJDBC_INTERMEDIATES)/javalib.jar:$(CORETESTS_INTERMEDIATES)/javalib.jar:$(JSR166TESTS_INTERMEDIATES)/javalib.jar:$(CONSCRYPTTESTS_INTERMEDIATES)/javalib.jar +GEN_CLASSPATH := \ + $(CORE_INTERMEDIATES)/classes.jar:$(CONSCRYPT_INTERMEDIATES)/classes.jar:$(BOUNCYCASTLE_INTERMEDIATES)/classes.jar:$(APACHEXML_INTERMEDIATES)/classes.jar:$(APACHEHARMONYTESTS_INTERMEDIATES)/classes.jar:$(OKHTTP_INTERMEDIATES)/classes.jar:$(OKHTTPTESTS_INTERMEDIATES)/classes.jar:$(OKHTTP_REPACKAGED_INTERMEDIATES)/classes.jar:$(JUNIT_INTERMEDIATES)/classes.jar:$(SQLITEJDBC_INTERMEDIATES)/javalib.jar:$(CORETESTS_INTERMEDIATES)/javalib.jar:$(JSR166TESTS_INTERMEDIATES)/javalib.jar:$(CONSCRYPTTESTS_INTERMEDIATES)/javalib.jar:$(TZDATAUPDATETESTS_INTERMEDIATES)/javalib.jar CTS_CORE_XMLS := \ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik.xml \ @@ -154,6 +160,7 @@ CTS_CORE_XMLS := \ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.harmony_prefs.xml \ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.harmony_sql.xml \ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.okhttp.xml \ + $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.tzdata.xml \ $(CTS_CORE_XMLS): PRIVATE_CLASSPATH:=$(GEN_CLASSPATH) # Why does this depend on javalib.jar instead of classes.jar? Because @@ -317,6 +324,13 @@ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.okhttp.xml: $(CTS_CORE_X $(OKHTTPTESTS_INTERMEDIATES)/javalib.jar,,\ $(TARGET_ARCH),libcore/expectations) +$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.tzdata.xml: $(CTS_CORE_XMLS_DEPS) + $(hide) mkdir -p $(CTS_TESTCASES_OUT) + $(call generate-core-test-description,$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.tzdata,\ + cts/tests/core/libcore/tzdata/AndroidManifest.xml,\ + $(TZDATAUPDATETESTS_INTERMEDIATES)/javalib.jar,,\ + $(TARGET_ARCH),libcore/expectations) + # ----- Generate the test descriptions for the vm-tests-tf ----- # CORE_VM_TEST_TF_DESC := $(CTS_TESTCASES_OUT)/android.core.vm-tests-tf.xml |