| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'variables': { | 5 'variables': { |
| 6 'chrome_browser_tests_sources': [ | 6 'chrome_browser_tests_sources': [ |
| 7 '../apps/app_restore_service_browsertest.cc', | 7 '../apps/app_restore_service_browsertest.cc', |
| 8 '../apps/load_and_launch_browsertest.cc', | 8 '../apps/load_and_launch_browsertest.cc', |
| 9 # TODO(blundell): Bring up a components_browsertests target and move | 9 # TODO(blundell): Bring up a components_browsertests target and move |
| 10 # this test to be in that target. crbug.com/283846 | 10 # this test to be in that target. crbug.com/283846 |
| (...skipping 2893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2904 { | 2904 { |
| 2905 'target_name': 'browser_tests_run', | 2905 'target_name': 'browser_tests_run', |
| 2906 'type': 'none', | 2906 'type': 'none', |
| 2907 'dependencies': [ | 2907 'dependencies': [ |
| 2908 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', | 2908 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', |
| 2909 'browser_tests', | 2909 'browser_tests', |
| 2910 'chrome', | 2910 'chrome', |
| 2911 ], | 2911 ], |
| 2912 'includes': [ | 2912 'includes': [ |
| 2913 '../build/isolate.gypi', | 2913 '../build/isolate.gypi', |
| 2914 'browser_tests.isolate', | |
| 2915 ], | 2914 ], |
| 2916 'sources': [ | 2915 'sources': [ |
| 2917 'browser_tests.isolate', | 2916 'browser_tests.isolate', |
| 2918 ], | 2917 ], |
| 2919 'conditions': [ | 2918 'conditions': [ |
| 2920 ['use_x11==1', { | 2919 ['use_x11==1', { |
| 2921 'dependencies': [ | 2920 'dependencies': [ |
| 2922 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2921 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2923 ], | 2922 ], |
| 2924 }], | 2923 }], |
| 2925 ], | 2924 ], |
| 2926 }, | 2925 }, |
| 2927 { | 2926 { |
| 2928 'target_name': 'interactive_ui_tests_run', | 2927 'target_name': 'interactive_ui_tests_run', |
| 2929 'type': 'none', | 2928 'type': 'none', |
| 2930 'dependencies': [ | 2929 'dependencies': [ |
| 2931 'interactive_ui_tests', | 2930 'interactive_ui_tests', |
| 2932 ], | 2931 ], |
| 2933 'conditions': [ | 2932 'conditions': [ |
| 2934 ['use_x11 == 1', { | 2933 ['use_x11 == 1', { |
| 2935 'dependencies': [ | 2934 'dependencies': [ |
| 2936 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2935 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2937 ], | 2936 ], |
| 2938 }], | 2937 }], |
| 2939 ], | 2938 ], |
| 2940 'includes': [ | 2939 'includes': [ |
| 2941 '../build/isolate.gypi', | 2940 '../build/isolate.gypi', |
| 2942 'interactive_ui_tests.isolate', | |
| 2943 ], | 2941 ], |
| 2944 'sources': [ | 2942 'sources': [ |
| 2945 'interactive_ui_tests.isolate', | 2943 'interactive_ui_tests.isolate', |
| 2946 ], | 2944 ], |
| 2947 }, | 2945 }, |
| 2948 { | 2946 { |
| 2949 'target_name': 'sync_integration_tests_run', | 2947 'target_name': 'sync_integration_tests_run', |
| 2950 'type': 'none', | 2948 'type': 'none', |
| 2951 'dependencies': [ | 2949 'dependencies': [ |
| 2952 'sync_integration_tests', | 2950 'sync_integration_tests', |
| 2953 ], | 2951 ], |
| 2954 'conditions': [ | 2952 'conditions': [ |
| 2955 ['use_x11 == 1', { | 2953 ['use_x11 == 1', { |
| 2956 'dependencies': [ | 2954 'dependencies': [ |
| 2957 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2955 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2958 ], | 2956 ], |
| 2959 }], | 2957 }], |
| 2960 ], | 2958 ], |
| 2961 'includes': [ | 2959 'includes': [ |
| 2962 '../build/isolate.gypi', | 2960 '../build/isolate.gypi', |
| 2963 'sync_integration_tests.isolate', | |
| 2964 ], | 2961 ], |
| 2965 'sources': [ | 2962 'sources': [ |
| 2966 'sync_integration_tests.isolate', | 2963 'sync_integration_tests.isolate', |
| 2967 ], | 2964 ], |
| 2968 }, | 2965 }, |
| 2969 ], | 2966 ], |
| 2970 'conditions': [ | 2967 'conditions': [ |
| 2971 ['archive_gpu_tests==1', { | 2968 ['archive_gpu_tests==1', { |
| 2972 'targets': [ | 2969 'targets': [ |
| 2973 { | 2970 { |
| 2974 'target_name': 'gpu_tests_base', | 2971 'target_name': 'gpu_tests_base', |
| 2975 'type': 'none', | 2972 'type': 'none', |
| 2976 'dependencies': [ | 2973 'dependencies': [ |
| 2977 # depend on icu to fix races. http://crbug.com/417583 | 2974 # depend on icu to fix races. http://crbug.com/417583 |
| 2978 '../third_party/icu/icu.gyp:icudata', | 2975 '../third_party/icu/icu.gyp:icudata', |
| 2979 ], | 2976 ], |
| 2980 'direct_dependent_settings': { | 2977 'direct_dependent_settings': { |
| 2981 'includes': [ | 2978 'includes': [ |
| 2982 '../build/isolate.gypi', | 2979 '../build/isolate.gypi', |
| 2983 ], | 2980 ], |
| 2984 }, | 2981 }, |
| 2985 }, | 2982 }, |
| 2986 { | 2983 { |
| 2987 'target_name': 'angle_unittests_run', | 2984 'target_name': 'angle_unittests_run', |
| 2988 'type': 'none', | 2985 'type': 'none', |
| 2989 'dependencies': [ | 2986 'dependencies': [ |
| 2990 '../gpu/gpu.gyp:angle_unittests', | 2987 '../gpu/gpu.gyp:angle_unittests', |
| 2991 'gpu_tests_base', | 2988 'gpu_tests_base', |
| 2992 ], | 2989 ], |
| 2993 'includes': [ | |
| 2994 'angle_unittests.isolate', | |
| 2995 ], | |
| 2996 'sources': [ | 2990 'sources': [ |
| 2997 'angle_unittests.isolate', | 2991 'angle_unittests.isolate', |
| 2998 ], | 2992 ], |
| 2999 }, | 2993 }, |
| 3000 { | 2994 { |
| 3001 'target_name': 'gl_tests_run', | 2995 'target_name': 'gl_tests_run', |
| 3002 'type': 'none', | 2996 'type': 'none', |
| 3003 'dependencies': [ | 2997 'dependencies': [ |
| 3004 '../gpu/gpu.gyp:gl_tests', | 2998 '../gpu/gpu.gyp:gl_tests', |
| 3005 'gpu_tests_base', | 2999 'gpu_tests_base', |
| 3006 ], | 3000 ], |
| 3007 'includes': [ | |
| 3008 'gl_tests.isolate', | |
| 3009 ], | |
| 3010 'sources': [ | 3001 'sources': [ |
| 3011 'gl_tests.isolate', | 3002 'gl_tests.isolate', |
| 3012 ], | 3003 ], |
| 3013 }, | 3004 }, |
| 3014 { | 3005 { |
| 3015 'target_name': 'tab_capture_end2end_tests_run', | 3006 'target_name': 'tab_capture_end2end_tests_run', |
| 3016 'type': 'none', | 3007 'type': 'none', |
| 3017 'dependencies': [ | 3008 'dependencies': [ |
| 3018 'browser_tests_run', | 3009 'browser_tests_run', |
| 3019 'gpu_tests_base', | 3010 'gpu_tests_base', |
| 3020 ], | 3011 ], |
| 3021 'includes': [ | |
| 3022 'tab_capture_end2end_tests.isolate', | |
| 3023 ], | |
| 3024 'sources': [ | 3012 'sources': [ |
| 3025 'tab_capture_end2end_tests.isolate', | 3013 'tab_capture_end2end_tests.isolate', |
| 3026 ], | 3014 ], |
| 3027 }, | 3015 }, |
| 3028 { | 3016 { |
| 3029 'target_name': 'telemetry_gpu_test_run', | 3017 'target_name': 'telemetry_gpu_test_run', |
| 3030 'type': 'none', | 3018 'type': 'none', |
| 3031 'dependencies': [ | 3019 'dependencies': [ |
| 3032 'chrome_run', | 3020 'chrome_run', |
| 3033 '../tools/telemetry/telemetry.gyp:bitmaptools#host', | 3021 '../tools/telemetry/telemetry.gyp:bitmaptools#host', |
| 3034 'gpu_tests_base', | 3022 'gpu_tests_base', |
| 3035 ], | 3023 ], |
| 3036 'includes': [ | |
| 3037 'telemetry_gpu_test.isolate', | |
| 3038 ], | |
| 3039 'sources': [ | 3024 'sources': [ |
| 3040 'telemetry_gpu_test.isolate', | 3025 'telemetry_gpu_test.isolate', |
| 3041 ], | 3026 ], |
| 3042 }, | 3027 }, |
| 3043 { | 3028 { |
| 3044 'target_name': 'gpu_unittests_run', | 3029 'target_name': 'gpu_unittests_run', |
| 3045 'type': 'none', | 3030 'type': 'none', |
| 3046 'dependencies': [ | 3031 'dependencies': [ |
| 3047 '../gpu/gpu.gyp:gpu_unittests', | 3032 '../gpu/gpu.gyp:gpu_unittests', |
| 3048 'gpu_tests_base', | 3033 'gpu_tests_base', |
| 3049 ], | 3034 ], |
| 3050 'includes': [ | |
| 3051 'gpu_unittests.isolate', | |
| 3052 ], | |
| 3053 'sources': [ | 3035 'sources': [ |
| 3054 'gpu_unittests.isolate', | 3036 'gpu_unittests.isolate', |
| 3055 ], | 3037 ], |
| 3056 }, | 3038 }, |
| 3057 ], | 3039 ], |
| 3058 'conditions': [ | 3040 'conditions': [ |
| 3059 ['internal_gles2_conform_tests==1', { | 3041 ['internal_gles2_conform_tests==1', { |
| 3060 'targets': [ | 3042 'targets': [ |
| 3061 { | 3043 { |
| 3062 'target_name': 'gles2_conform_test_run', | 3044 'target_name': 'gles2_conform_test_run', |
| 3063 'type': 'none', | 3045 'type': 'none', |
| 3064 'dependencies': [ | 3046 'dependencies': [ |
| 3065 '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_c
onform_test', | 3047 '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_c
onform_test', |
| 3066 'gpu_tests_base', | 3048 'gpu_tests_base', |
| 3067 ], | 3049 ], |
| 3068 'includes': [ | |
| 3069 'gles2_conform_test.isolate', | |
| 3070 ], | |
| 3071 'sources': [ | 3050 'sources': [ |
| 3072 'gles2_conform_test.isolate', | 3051 'gles2_conform_test.isolate', |
| 3073 ], | 3052 ], |
| 3074 }, | 3053 }, |
| 3075 ], | 3054 ], |
| 3076 }], | 3055 }], |
| 3077 ], | 3056 ], |
| 3078 }], | 3057 }], |
| 3079 ], | 3058 ], |
| 3080 }], | 3059 }], |
| (...skipping 15 matching lines...) Expand all Loading... |
| 3096 ['enable_webrtc==1', { | 3075 ['enable_webrtc==1', { |
| 3097 'dependencies': [ | 3076 'dependencies': [ |
| 3098 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3077 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3099 ] | 3078 ] |
| 3100 }], | 3079 }], |
| 3101 ], | 3080 ], |
| 3102 }] | 3081 }] |
| 3103 }], | 3082 }], |
| 3104 ], # 'conditions' | 3083 ], # 'conditions' |
| 3105 } | 3084 } |
| OLD | NEW |