зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1033481 - Use a .mozbuild file rather than a .mk in m/a/tests/background/junit3. r=rnewman
--HG-- rename : mobile/android/tests/background/junit3/android-services.mozbuild => mobile/android/tests/background/junit3/background_junit3_sources.mozbuild
This commit is contained in:
Nick Alexander
Родитель
abe8fffd97
Коммит
6fa6af293a
|
|
@ -4,6 +4,10 @@
|
|||
|
||||
ANDROID_APK_NAME := background-junit3-debug
|
||||
|
||||
ANDROID_EXTRA_JARS := \
|
||||
background-junit3.jar \
|
||||
$(NULL)
|
||||
|
||||
PP_TARGETS += manifest
|
||||
manifest := $(srcdir)/AndroidManifest.xml.in
|
||||
manifest_TARGET := AndroidManifest.xml
|
||||
|
|
@ -17,16 +21,11 @@ ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml
|
|||
|
||||
GARBAGE += AndroidManifest.xml
|
||||
|
||||
include $(srcdir)/android-services-files.mk
|
||||
|
||||
# BACKGROUND_TESTS_{JAVA,RES}_FILES are defined in android-services-files.mk.
|
||||
JAVAFILES := $(BACKGROUND_TESTS_JAVA_FILES)
|
||||
|
||||
# The test APK needs to know the contents of the target APK while not
|
||||
# being linked against them. This is a best effort to avoid getting
|
||||
# out of sync with base's build config.
|
||||
JARS_DIR := $(DEPTH)/mobile/android/base
|
||||
JAVA_BOOTCLASSPATH := $(JAVA_BOOTCLASSPATH):$(subst $(NULL) ,:,$(wildcard $(JARS_DIR)/*.jar))
|
||||
JAVA_BOOTCLASSPATH := $(ANDROID_SDK)/android.jar:$(subst $(NULL) ,:,$(wildcard $(JARS_DIR)/*.jar))
|
||||
# We also want to re-compile classes.dex when the associated base
|
||||
# content changes.
|
||||
classes.dex: $(wildcard $(JARS_DIR)/*.jar)
|
||||
|
|
|
|||
|
|
@ -1,110 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# These files are managed in the android-sync repo. Do not modify directly, or your changes will be lost.
|
||||
BACKGROUND_TESTS_JAVA_FILES := \
|
||||
src/announcements/TestAnnouncementsBroadcastService.java \
|
||||
src/common/TestAndroidLogWriters.java \
|
||||
src/common/TestBrowserContractHelpers.java \
|
||||
src/common/TestDateUtils.java \
|
||||
src/common/TestUtils.java \
|
||||
src/common/TestWaitHelper.java \
|
||||
src/db/AndroidBrowserRepositoryTestCase.java \
|
||||
src/db/TestAndroidBrowserBookmarksRepository.java \
|
||||
src/db/TestAndroidBrowserHistoryDataExtender.java \
|
||||
src/db/TestAndroidBrowserHistoryRepository.java \
|
||||
src/db/TestBookmarks.java \
|
||||
src/db/TestCachedSQLiteOpenHelper.java \
|
||||
src/db/TestClientsDatabase.java \
|
||||
src/db/TestClientsDatabaseAccessor.java \
|
||||
src/db/TestFennecTabsRepositorySession.java \
|
||||
src/db/TestFennecTabsStorage.java \
|
||||
src/db/TestFormHistoryRepositorySession.java \
|
||||
src/db/TestPasswordsRepository.java \
|
||||
src/fxa/authenticator/TestAccountPickler.java \
|
||||
src/fxa/TestBrowserIDKeyPairGeneration.java \
|
||||
src/fxa/TestFirefoxAccounts.java \
|
||||
src/healthreport/MockDatabaseEnvironment.java \
|
||||
src/healthreport/MockHealthReportDatabaseStorage.java \
|
||||
src/healthreport/MockHealthReportSQLiteOpenHelper.java \
|
||||
src/healthreport/MockProfileInformationCache.java \
|
||||
src/healthreport/prune/TestHealthReportPruneService.java \
|
||||
src/healthreport/prune/TestPrunePolicyDatabaseStorage.java \
|
||||
src/healthreport/TestEnvironmentBuilder.java \
|
||||
src/healthreport/TestEnvironmentV1HashAppender.java \
|
||||
src/healthreport/TestHealthReportBroadcastService.java \
|
||||
src/healthreport/TestHealthReportDatabaseStorage.java \
|
||||
src/healthreport/TestHealthReportGenerator.java \
|
||||
src/healthreport/TestHealthReportProvider.java \
|
||||
src/healthreport/TestHealthReportSQLiteOpenHelper.java \
|
||||
src/healthreport/TestProfileInformationCache.java \
|
||||
src/healthreport/upload/TestAndroidSubmissionClient.java \
|
||||
src/healthreport/upload/TestHealthReportUploadService.java \
|
||||
src/helpers/AndroidSyncTestCase.java \
|
||||
src/helpers/BackgroundServiceTestCase.java \
|
||||
src/helpers/DBHelpers.java \
|
||||
src/helpers/DBProviderTestCase.java \
|
||||
src/helpers/FakeProfileTestCase.java \
|
||||
src/nativecode/test/TestNativeCrypto.java \
|
||||
src/sync/AndroidSyncTestCaseWithAccounts.java \
|
||||
src/sync/helpers/BookmarkHelpers.java \
|
||||
src/sync/helpers/DefaultBeginDelegate.java \
|
||||
src/sync/helpers/DefaultCleanDelegate.java \
|
||||
src/sync/helpers/DefaultDelegate.java \
|
||||
src/sync/helpers/DefaultFetchDelegate.java \
|
||||
src/sync/helpers/DefaultFinishDelegate.java \
|
||||
src/sync/helpers/DefaultGuidsSinceDelegate.java \
|
||||
src/sync/helpers/DefaultSessionCreationDelegate.java \
|
||||
src/sync/helpers/DefaultStoreDelegate.java \
|
||||
src/sync/helpers/ExpectBeginDelegate.java \
|
||||
src/sync/helpers/ExpectBeginFailDelegate.java \
|
||||
src/sync/helpers/ExpectFetchDelegate.java \
|
||||
src/sync/helpers/ExpectFetchSinceDelegate.java \
|
||||
src/sync/helpers/ExpectFinishDelegate.java \
|
||||
src/sync/helpers/ExpectFinishFailDelegate.java \
|
||||
src/sync/helpers/ExpectGuidsSinceDelegate.java \
|
||||
src/sync/helpers/ExpectInvalidRequestFetchDelegate.java \
|
||||
src/sync/helpers/ExpectInvalidTypeStoreDelegate.java \
|
||||
src/sync/helpers/ExpectManyStoredDelegate.java \
|
||||
src/sync/helpers/ExpectNoGUIDsSinceDelegate.java \
|
||||
src/sync/helpers/ExpectStoreCompletedDelegate.java \
|
||||
src/sync/helpers/ExpectStoredDelegate.java \
|
||||
src/sync/helpers/HistoryHelpers.java \
|
||||
src/sync/helpers/PasswordHelpers.java \
|
||||
src/sync/helpers/SessionTestHelper.java \
|
||||
src/sync/helpers/SimpleSuccessBeginDelegate.java \
|
||||
src/sync/helpers/SimpleSuccessCreationDelegate.java \
|
||||
src/sync/helpers/SimpleSuccessFetchDelegate.java \
|
||||
src/sync/helpers/SimpleSuccessFinishDelegate.java \
|
||||
src/sync/helpers/SimpleSuccessStoreDelegate.java \
|
||||
src/sync/TestAccountPickler.java \
|
||||
src/sync/TestClientsStage.java \
|
||||
src/sync/TestConfigurationMigrator.java \
|
||||
src/sync/TestResetting.java \
|
||||
src/sync/TestSendTabData.java \
|
||||
src/sync/TestStoreTracking.java \
|
||||
src/sync/TestSyncAccounts.java \
|
||||
src/sync/TestSyncAuthenticatorService.java \
|
||||
src/sync/TestSyncConfiguration.java \
|
||||
src/sync/TestTabsRecord.java \
|
||||
src/sync/TestUpgradeRequired.java \
|
||||
src/sync/TestWebURLFinder.java \
|
||||
src/telemetry/TestTelemetryRecorder.java \
|
||||
src/testhelpers/BaseMockServerSyncStage.java \
|
||||
src/testhelpers/CommandHelpers.java \
|
||||
src/testhelpers/DefaultGlobalSessionCallback.java \
|
||||
src/testhelpers/JPakeNumGeneratorFixed.java \
|
||||
src/testhelpers/MockAbstractNonRepositorySyncStage.java \
|
||||
src/testhelpers/MockClientsDatabaseAccessor.java \
|
||||
src/testhelpers/MockClientsDataDelegate.java \
|
||||
src/testhelpers/MockGlobalSession.java \
|
||||
src/testhelpers/MockPrefsGlobalSession.java \
|
||||
src/testhelpers/MockRecord.java \
|
||||
src/testhelpers/MockServerSyncStage.java \
|
||||
src/testhelpers/MockSharedPreferences.java \
|
||||
src/testhelpers/StubDelegate.java \
|
||||
src/testhelpers/WaitHelper.java \
|
||||
src/testhelpers/WBORepository.java \
|
||||
$(NULL)
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
background_junit3_sources = [
|
||||
'src/announcements/TestAnnouncementsBroadcastService.java',
|
||||
'src/common/TestAndroidLogWriters.java',
|
||||
'src/common/TestBrowserContractHelpers.java',
|
||||
'src/common/TestDateUtils.java',
|
||||
'src/common/TestUtils.java',
|
||||
'src/common/TestWaitHelper.java',
|
||||
'src/db/AndroidBrowserRepositoryTestCase.java',
|
||||
'src/db/TestAndroidBrowserBookmarksRepository.java',
|
||||
'src/db/TestAndroidBrowserHistoryDataExtender.java',
|
||||
'src/db/TestAndroidBrowserHistoryRepository.java',
|
||||
'src/db/TestBookmarks.java',
|
||||
'src/db/TestCachedSQLiteOpenHelper.java',
|
||||
'src/db/TestClientsDatabase.java',
|
||||
'src/db/TestClientsDatabaseAccessor.java',
|
||||
'src/db/TestFennecTabsRepositorySession.java',
|
||||
'src/db/TestFennecTabsStorage.java',
|
||||
'src/db/TestFormHistoryRepositorySession.java',
|
||||
'src/db/TestPasswordsRepository.java',
|
||||
'src/fxa/authenticator/TestAccountPickler.java',
|
||||
'src/fxa/TestBrowserIDKeyPairGeneration.java',
|
||||
'src/fxa/TestFirefoxAccounts.java',
|
||||
'src/healthreport/MockDatabaseEnvironment.java',
|
||||
'src/healthreport/MockHealthReportDatabaseStorage.java',
|
||||
'src/healthreport/MockHealthReportSQLiteOpenHelper.java',
|
||||
'src/healthreport/MockProfileInformationCache.java',
|
||||
'src/healthreport/prune/TestHealthReportPruneService.java',
|
||||
'src/healthreport/prune/TestPrunePolicyDatabaseStorage.java',
|
||||
'src/healthreport/TestEnvironmentBuilder.java',
|
||||
'src/healthreport/TestEnvironmentV1HashAppender.java',
|
||||
'src/healthreport/TestHealthReportBroadcastService.java',
|
||||
'src/healthreport/TestHealthReportDatabaseStorage.java',
|
||||
'src/healthreport/TestHealthReportGenerator.java',
|
||||
'src/healthreport/TestHealthReportProvider.java',
|
||||
'src/healthreport/TestHealthReportSQLiteOpenHelper.java',
|
||||
'src/healthreport/TestProfileInformationCache.java',
|
||||
'src/healthreport/upload/TestAndroidSubmissionClient.java',
|
||||
'src/healthreport/upload/TestHealthReportUploadService.java',
|
||||
'src/helpers/AndroidSyncTestCase.java',
|
||||
'src/helpers/BackgroundServiceTestCase.java',
|
||||
'src/helpers/DBHelpers.java',
|
||||
'src/helpers/DBProviderTestCase.java',
|
||||
'src/helpers/FakeProfileTestCase.java',
|
||||
'src/nativecode/test/TestNativeCrypto.java',
|
||||
'src/sync/AndroidSyncTestCaseWithAccounts.java',
|
||||
'src/sync/helpers/BookmarkHelpers.java',
|
||||
'src/sync/helpers/DefaultBeginDelegate.java',
|
||||
'src/sync/helpers/DefaultCleanDelegate.java',
|
||||
'src/sync/helpers/DefaultDelegate.java',
|
||||
'src/sync/helpers/DefaultFetchDelegate.java',
|
||||
'src/sync/helpers/DefaultFinishDelegate.java',
|
||||
'src/sync/helpers/DefaultGuidsSinceDelegate.java',
|
||||
'src/sync/helpers/DefaultSessionCreationDelegate.java',
|
||||
'src/sync/helpers/DefaultStoreDelegate.java',
|
||||
'src/sync/helpers/ExpectBeginDelegate.java',
|
||||
'src/sync/helpers/ExpectBeginFailDelegate.java',
|
||||
'src/sync/helpers/ExpectFetchDelegate.java',
|
||||
'src/sync/helpers/ExpectFetchSinceDelegate.java',
|
||||
'src/sync/helpers/ExpectFinishDelegate.java',
|
||||
'src/sync/helpers/ExpectFinishFailDelegate.java',
|
||||
'src/sync/helpers/ExpectGuidsSinceDelegate.java',
|
||||
'src/sync/helpers/ExpectInvalidRequestFetchDelegate.java',
|
||||
'src/sync/helpers/ExpectInvalidTypeStoreDelegate.java',
|
||||
'src/sync/helpers/ExpectManyStoredDelegate.java',
|
||||
'src/sync/helpers/ExpectNoGUIDsSinceDelegate.java',
|
||||
'src/sync/helpers/ExpectStoreCompletedDelegate.java',
|
||||
'src/sync/helpers/ExpectStoredDelegate.java',
|
||||
'src/sync/helpers/HistoryHelpers.java',
|
||||
'src/sync/helpers/PasswordHelpers.java',
|
||||
'src/sync/helpers/SessionTestHelper.java',
|
||||
'src/sync/helpers/SimpleSuccessBeginDelegate.java',
|
||||
'src/sync/helpers/SimpleSuccessCreationDelegate.java',
|
||||
'src/sync/helpers/SimpleSuccessFetchDelegate.java',
|
||||
'src/sync/helpers/SimpleSuccessFinishDelegate.java',
|
||||
'src/sync/helpers/SimpleSuccessStoreDelegate.java',
|
||||
'src/sync/TestAccountPickler.java',
|
||||
'src/sync/TestClientsStage.java',
|
||||
'src/sync/TestConfigurationMigrator.java',
|
||||
'src/sync/TestResetting.java',
|
||||
'src/sync/TestSendTabData.java',
|
||||
'src/sync/TestStoreTracking.java',
|
||||
'src/sync/TestSyncAccounts.java',
|
||||
'src/sync/TestSyncAuthenticatorService.java',
|
||||
'src/sync/TestSyncConfiguration.java',
|
||||
'src/sync/TestTabsRecord.java',
|
||||
'src/sync/TestUpgradeRequired.java',
|
||||
'src/sync/TestWebURLFinder.java',
|
||||
'src/telemetry/TestTelemetryRecorder.java',
|
||||
'src/testhelpers/BaseMockServerSyncStage.java',
|
||||
'src/testhelpers/CommandHelpers.java',
|
||||
'src/testhelpers/DefaultGlobalSessionCallback.java',
|
||||
'src/testhelpers/JPakeNumGeneratorFixed.java',
|
||||
'src/testhelpers/MockAbstractNonRepositorySyncStage.java',
|
||||
'src/testhelpers/MockClientsDatabaseAccessor.java',
|
||||
'src/testhelpers/MockClientsDataDelegate.java',
|
||||
'src/testhelpers/MockGlobalSession.java',
|
||||
'src/testhelpers/MockPrefsGlobalSession.java',
|
||||
'src/testhelpers/MockRecord.java',
|
||||
'src/testhelpers/MockServerSyncStage.java',
|
||||
'src/testhelpers/MockSharedPreferences.java',
|
||||
'src/testhelpers/StubDelegate.java',
|
||||
'src/testhelpers/WaitHelper.java',
|
||||
'src/testhelpers/WBORepository.java',
|
||||
]
|
||||
|
|
@ -6,7 +6,10 @@
|
|||
|
||||
DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
|
||||
|
||||
include('android-services.mozbuild')
|
||||
include('background_junit3_sources.mozbuild')
|
||||
|
||||
jar = add_java_jar('background-junit3')
|
||||
jar.sources += background_junit3_sources
|
||||
|
||||
main = add_android_eclipse_project('BackgroundInstrumentationTests', OBJDIR + '/AndroidManifest.xml')
|
||||
main.package_name = 'org.mozilla.gecko.background.tests'
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче