Skip to content

Commit

Permalink
Add Robolectric unittest suites to all.gyp and rename build targets.
Browse files Browse the repository at this point in the history
Renaming chrome_shell_unit_tests to chrome_junit_tests as it tests code in the directory of the chrome_java target (and not the chrome_shell_java target). Same thing for content_shell_unit_tests. And adding chrome_junit_tests and content_junit_tests to the all.gyp file so we can run the tests on some of the bots.

BUG=

Review URL: https://codereview.chromium.org/1039733002

Cr-Commit-Position: refs/heads/master@{#322813}
  • Loading branch information
case540 authored and Commit bot committed Mar 30, 2015
1 parent 78d90a0 commit e240ab4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,7 @@
'../components/components_tests.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_gl_tests',
'../content/content_shell_and_tests.gyp:content_junit_tests',
'../content/content_shell_and_tests.gyp:chromium_linker_test_apk',
'../content/content_shell_and_tests.gyp:content_shell_test_apk',
'../content/content_shell_and_tests.gyp:content_unittests',
Expand Down Expand Up @@ -809,6 +810,7 @@
'../base/base.gyp:base_unittests_apk',
'../cc/blink/cc_blink_tests.gyp:cc_blink_unittests_apk',
'../cc/cc_tests.gyp:cc_unittests_apk',
'../chrome/chrome.gyp:chrome_junit_tests',
'../chrome/chrome.gyp:chrome_shell_test_apk',
'../chrome/chrome.gyp:chrome_sync_shell_test_apk',
'../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
Expand Down
4 changes: 2 additions & 2 deletions chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ android_apk("chrome_shell_test_apk") {
android_manifest = "shell/javatests/AndroidManifest.xml"
}

# GYP: //chrome/chrome_tests.gypi:chrome_shell_unit_tests
java_binary("chrome_shell_unit_tests") {
# GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
java_binary("chrome_junit_tests") {
testonly = true
java_files = [ "android/junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ]
main_class = "org.chromium.testing.local.JunitTestMain"
Expand Down
4 changes: 2 additions & 2 deletions chrome/chrome_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -2928,8 +2928,8 @@
'includes': [ '../build/java_apk.gypi' ],
},
{
# GN: //chrome/android:chrome_shell_unit_tests
'target_name': 'chrome_shell_unit_tests',
# GN: //chrome/android:chrome_junit_tests
'target_name': 'chrome_junit_tests',
'type': 'none',
'dependencies': [
'chrome_java',
Expand Down
4 changes: 2 additions & 2 deletions content/content_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -2028,8 +2028,8 @@
'includes': [ '../build/java_apk.gypi' ],
},
{
# GN: //content/public/android:content_shell_unit_tests
'target_name': 'content_shell_unit_tests',
# GN: //content/public/android:content_junit_tests
'target_name': 'content_junit_tests',
'type': 'none',
'dependencies': [
'content.gyp:content_java',
Expand Down
4 changes: 2 additions & 2 deletions content/public/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ android_library("content_javatests") {
DEPRECATED_java_in_dir = "javatests/src"
}

# GYP: //content/content_tests.gypi:content_shell_unit_tests
java_binary("chrome_shell_unit_tests") {
# GYP: //content/content_tests.gypi:content_junit_tests
java_binary("content_junit_tests") {
testonly = true
java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTest.java" ]
main_class = "org.chromium.testing.local.JunitTestMain"
Expand Down

0 comments on commit e240ab4

Please sign in to comment.