Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: testing/android/junit/junit_test.gyp

Issue 1003463002: Add json output to Junit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed kzaikin's comments. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 # GN: //testing/android/junit:junit_test_support 8 # GN: //testing/android/junit:junit_test_support
nyquist 2015/03/23 23:53:48 You probably meant to update the GN target too.
mikecase (-- gone --) 2015/03/24 00:35:24 After a rebase, this line was no longer needed (ad
9 'target_name': 'junit_test_support', 9 'target_name': 'junit_test_support',
10 'type': 'none', 10 'type': 'none',
11 'dependencies': [ 11 'dependencies': [
12 '../../../third_party/junit/junit.gyp:junit_jar', 12 '../../../third_party/junit/junit.gyp:junit_jar',
13 '../../../third_party/mockito/mockito.gyp:mockito_jar', 13 '../../../third_party/mockito/mockito.gyp:mockito_jar',
14 '../../../third_party/robolectric/robolectric.gyp:robolectric_jar' 14 '../../../third_party/robolectric/robolectric.gyp:robolectric_jar',
15 ], 15 ],
16 'variables': { 16 'variables': {
17 'src_paths': [ 17 'src_paths': [
18 'java/src', 18 'java/src',
19 ], 19 ],
20 }, 20 },
21 'includes': [ 21 'includes': [
22 '../../../build/host_jar.gypi', 22 '../../../build/host_jar.gypi',
23 ], 23 ],
24 }, 24 },
25 { 25 {
26 # GN: //testing/android/junit:junit_unittests 26 # GN: //testing/android/junit:junit_unittests
27 'target_name': 'junit_unit_tests', 27 'target_name': 'junit_unit_tests',
28 'type': 'none', 28 'type': 'none',
29 'dependencies': [ 29 'dependencies': [
30 'junit_test_support', 30 'junit_test_support',
31 ], 31 ],
32 'variables': { 32 'variables': {
33 'main_class': 'org.chromium.testing.local.JunitTestMain', 33 'main_class': 'org.chromium.testing.local.JunitTestMain',
34 'src_paths': [ 34 'src_paths': [
35 'javatests/src', 35 'javatests/src',
36 ], 36 ],
37 }, 37 },
38 'includes': [ 38 'includes': [
39 '../../../build/host_jar.gypi', 39 '../../../build/host_jar.gypi',
40 ], 40 ],
41 }, 41 },
42 ], 42 ],
43 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698