Bug 1065773 - Part 3: Add release signed instrumentation test APKs to instrumentation/ in tests package. r=mshal

This commit is contained in:
Nick Alexander 2014-09-19 13:52:56 -07:00
parent 6fabb8b5e0
commit 426219f82f
5 changed files with 51 additions and 2 deletions

View File

@ -9,6 +9,9 @@ if not CONFIG['LIBXUL_SDK']:
elif CONFIG['ENABLE_TESTS']:
add_tier_dir('testharness', 'testing/mochitest')
if CONFIG['ENABLE_TESTS']:
add_tier_dir('testharness', 'testing/instrumentation')
if CONFIG['MOZ_EXTENSIONS']:
add_tier_dir('app', 'extensions')

View File

@ -0,0 +1,24 @@
# 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/.
_DEST_DIR = $(DEPTH)/_tests/instrumentation
PKG_STAGE = $(DIST)/test-stage
include $(topsrcdir)/config/rules.mk
# Fennec and all instrumentation tests need to be signed with the same
# key, which means release signing them all.
JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
include $(topsrcdir)/config/android-common.mk
stage-package:
$(NSINSTALL) -D $(_DEST_DIR)
$(call RELEASE_SIGN_ANDROID_APK,\
$(DEPTH)/mobile/android/tests/background/junit3/background-junit3-debug-unsigned-unaligned.apk,\
$(_DEST_DIR)/background-junit3.apk)
$(call RELEASE_SIGN_ANDROID_APK,\
$(DEPTH)/mobile/android/tests/browser/junit3/browser-junit3-debug-unsigned-unaligned.apk,\
$(_DEST_DIR)/browser-junit3.apk)
@(cd $(DEPTH)/_tests/ && tar $(TAR_CREATE_FLAGS) - instrumentation) | (cd $(PKG_STAGE) && tar -xf -)

View File

@ -0,0 +1,9 @@
# -*- 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/.
TEST_HARNESS_FILES.instrumentation += [
'runinstrumentation.py',
]

View File

@ -0,0 +1,10 @@
#!/usr/bin/env 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/.
import sys
if __name__ == "__main__":
sys.exit(1)

View File

@ -423,6 +423,7 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
package-tests: stage-android
package-tests: stage-instrumentation-tests
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
@ -518,8 +519,6 @@ else
cp -RL $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittests
endif
stage-jittest: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/jit-test/tests
cp -RL $(topsrcdir)/js/src/jsapi.h $(PKG_STAGE)/jit-test
@ -552,6 +551,9 @@ stage-mozbase: make-stage-dir
stage-web-platform-tests: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/web-platform stage-package
stage-instrumentation-tests: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/instrumentation stage-package
.PHONY: \
mochitest \
mochitest-plain \
@ -579,5 +581,6 @@ stage-web-platform-tests: make-stage-dir
stage-marionette \
stage-steeplechase \
stage-web-platform-tests \
stage-instrumentation-tests \
$(NULL)