| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 Import('env') | 6 Import('env') |
| 7 | 7 |
| 8 # TODO(robertm): those should not be necessary once we go -std=c99 | 8 # TODO(robertm): those should not be necessary once we go -std=c99 |
| 9 env.FilterOut(CFLAGS=['-pedantic']) | 9 env.FilterOut(CFLAGS=['-pedantic']) |
| 10 env.FilterOut(CCFLAGS=['-pedantic']) | 10 env.FilterOut(CCFLAGS=['-pedantic']) |
| 11 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + |
| 12 'progress_events') |
| 11 | 13 |
| 12 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'), | 14 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'), |
| 13 | 15 |
| 14 progress_events_target = ('ppapi_progress_events_%s' % | 16 progress_events_target = ('ppapi_progress_events_%s' % |
| 15 env.get('TARGET_FULLARCH')) | 17 env.get('TARGET_FULLARCH')) |
| 16 env.ComponentProgram(progress_events_target, | 18 env.ComponentProgram(progress_events_target, |
| 17 [progress_events_sources], | 19 [progress_events_sources], |
| 18 EXTRA_LIBS=['${PPAPI_LIBS}', | 20 EXTRA_LIBS=['${PPAPI_LIBS}', |
| 19 'ppapi_test_lib', | 21 'ppapi_test_lib', |
| 20 'pthread', | 22 'pthread', |
| 21 'platform', | 23 'platform', |
| 22 'gio']) | 24 'gio']) |
| 23 | 25 |
| 24 # Needed by other tests using progress events. | 26 # Needed by other tests using progress events. |
| 25 env.Publish(progress_events_target, 'run', [ | 27 env.Publish(progress_events_target, 'run', [ |
| 26 'ppapi_progress_events.html', | 28 'ppapi_progress_events.html', |
| 27 'ppapi_progress_events.nmf', | |
| 28 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' + | 29 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' + |
| 29 'ppapi_progress_events.js'), | 30 'ppapi_progress_events.js'), |
| 30 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js', | 31 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js', |
| 31 ]) | 32 ]) |
| 32 | 33 |
| 33 node = env.PPAPIBrowserTester( | 34 node = env.PPAPIBrowserTester( |
| 34 'ppapi_progress_events_browser_test.out', | 35 'ppapi_progress_events_browser_test.out', |
| 35 url='ppapi_progress_events.html', | 36 url='ppapi_progress_events.html', |
| 37 nmf='${TEST_DIR}/ppapi_progress_events.nmf', |
| 36 files=env.ExtractPublishedFiles(progress_events_target)) | 38 files=env.ExtractPublishedFiles(progress_events_target)) |
| 37 | 39 |
| 38 env.AddNodeToTestSuite(node, | 40 env.AddNodeToTestSuite(node, |
| 39 ['chrome_browser_tests'], | 41 ['chrome_browser_tests'], |
| 40 'run_ppapi_progress_events_browser_test', | 42 'run_ppapi_progress_events_browser_test', |
| 41 is_broken=env.PPAPIBrowserTesterIsBroken()) | 43 is_broken=env.PPAPIBrowserTesterIsBroken()) |
| OLD | NEW |