| OLD | NEW | 
|   1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. |   1 # Copyright (c) 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   'conditions': [ |   5   'conditions': [ | 
|   6     ['use_x11==0', { |   6     ['use_x11==0', { | 
|   7       'variables': { |   7       'variables': { | 
|   8         'command': [ |   8         'command': [ | 
|   9           '../testing/test_env.py', |   9           '../testing/test_env.py', | 
|  10           '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', |  10           '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', | 
|  11           '--test-launcher-bot-mode', |  11           '--test-launcher-bot-mode', | 
|  12         ], |  12         ], | 
|  13       }, |  13       }, | 
|  14     }], |  14     }], | 
|  15     ['use_x11==1', { |  15     ['use_x11==1', { | 
|  16       'variables': { |  16       'variables': { | 
|  17         'command': [ |  17         'command': [ | 
|  18           '../testing/xvfb.py', |  18           '../testing/xvfb.py', | 
|  19           '<(PRODUCT_DIR)', |  19           '<(PRODUCT_DIR)', | 
|  20           '<(PRODUCT_DIR)/ash_unittests', |  20           '<(PRODUCT_DIR)/ash_unittests', | 
|  21           '--test-launcher-bot-mode', |  21           '--test-launcher-bot-mode', | 
|  22         ], |  22         ], | 
|  23         'files': [ |  23         'files': [ | 
|  24           '../testing/xvfb.py', |  24           '../testing/xvfb.py', | 
|  25           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |  25           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', | 
|  26         ], |  26         ], | 
|  27       }, |  27       }, | 
|  28     }], |  28     }], | 
|  29     ['OS=="win" or chromeos==1', { |  29     ['chromeos==1', { | 
|  30       'variables': { |  30       'variables': { | 
|  31         'files': [ |  31         'files': [ | 
|  32           '../testing/test_env.py', |  32           '../testing/test_env.py', | 
|  33           '<(PRODUCT_DIR)/chrome_100_percent.pak', |  33           '<(PRODUCT_DIR)/chrome_100_percent.pak', | 
|  34           '<(PRODUCT_DIR)/chrome_200_percent.pak', |  34           '<(PRODUCT_DIR)/chrome_200_percent.pak', | 
|  35           '<(PRODUCT_DIR)/locales/en-US.pak', |  35           '<(PRODUCT_DIR)/locales/en-US.pak', | 
|  36           '<(PRODUCT_DIR)/keyboard_resources.pak', |  36           '<(PRODUCT_DIR)/keyboard_resources.pak', | 
|  37         ], |  37         ], | 
|  38       }, |  38       }, | 
|  39     }], |  39     }], | 
|  40  |  40  | 
|  41     ['chromeos==1', { |  41     ['chromeos==1', { | 
|  42       'variables': { |  42       'variables': { | 
|  43         'files': [ |  43         'files': [ | 
|  44           'display/test_data/' |  44           'display/test_data/' | 
|  45         ], |  45         ], | 
|  46       }, |  46       }, | 
|  47     }], |  47     }], | 
|  48     ['OS=="linux"', { |  48     ['OS=="linux"', { | 
|  49       'variables': { |  49       'variables': { | 
|  50         'files': [ |  50         'files': [ | 
|  51           '<(PRODUCT_DIR)/libosmesa.so', |  51           '<(PRODUCT_DIR)/libosmesa.so', | 
|  52         ], |  52         ], | 
|  53       }, |  53       }, | 
|  54     }], |  54     }], | 
|  55     ['OS=="win"', { |  | 
|  56       'variables': { |  | 
|  57         'files': [ |  | 
|  58           '<(PRODUCT_DIR)/osmesa.dll', |  | 
|  59         ], |  | 
|  60       }, |  | 
|  61     }], |  | 
|  62     ['OS=="win" and (fastbuild==0 or fastbuild==1)', { |  | 
|  63       'variables': { |  | 
|  64         'files': [ |  | 
|  65           '<(PRODUCT_DIR)/ash_unittests.exe.pdb', |  | 
|  66         ], |  | 
|  67       }, |  | 
|  68     }], |  | 
|  69   ], |  55   ], | 
|  70   'includes': [ |  56   'includes': [ | 
|  71     '../base/base.isolate', |  57     '../base/base.isolate', | 
|  72     '../ui/gl/gl.isolate', |  58     '../ui/gl/gl.isolate', | 
|  73   ], |  59   ], | 
|  74 } |  60 } | 
| OLD | NEW |