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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/ppb_audio/nacl.scons

Issue 10868029: Inlining PPAPI_LIBS as its now the same everywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 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 # This test uses ppapi_test_lib. 6 # This test uses ppapi_test_lib.
7 7
8 Import('env') 8 Import('env')
9 9
10 env.Prepend(CPPDEFINES=['XP_UNIX']) 10 env.Prepend(CPPDEFINES=['XP_UNIX'])
11 11
12 nexe = env.ProgramNameForNmf('ppapi_ppb_audio') 12 nexe = env.ProgramNameForNmf('ppapi_ppb_audio')
13 env.Alias('ppapi_ppb_audio${PROGSUFFIX}', 13 env.Alias('ppapi_ppb_audio${PROGSUFFIX}',
14 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) 14 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
15 15
16 ppapi_ppb_audio_nexe = env.ComponentProgram( 16 ppapi_ppb_audio_nexe = env.ComponentProgram(
17 nexe, 17 nexe,
18 [ 'ppapi_ppb_audio.cc' ], 18 [ 'ppapi_ppb_audio.cc' ],
19 EXTRA_LIBS=['${PPAPI_LIBS}', 19 EXTRA_LIBS=['ppapi',
20 'ppapi_test_lib', 20 'ppapi_test_lib',
21 'platform', # for CHECK 21 'platform', # for CHECK
22 'pthread', 22 'pthread',
23 'gio', 23 'gio',
24 ]) 24 ])
25 25
26 dest_copy = env.Publish(nexe, 'run', 26 dest_copy = env.Publish(nexe, 'run',
27 ['ppapi_ppb_audio.html', 27 ['ppapi_ppb_audio.html',
28 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' 28 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
29 'browserdata/nacltest.js') 29 'browserdata/nacltest.js')
30 ]) 30 ])
31 31
32 node = env.PPAPIBrowserTester('ppapi_ppb_audio_browser_test.out', 32 node = env.PPAPIBrowserTester('ppapi_ppb_audio_browser_test.out',
33 url='ppapi_ppb_audio.html', 33 url='ppapi_ppb_audio.html',
34 nmf_names=['ppapi_ppb_audio'], 34 nmf_names=['ppapi_ppb_audio'],
35 files=[ ppapi_ppb_audio_nexe, 35 files=[ ppapi_ppb_audio_nexe,
36 env.File('ppapi_ppb_audio.html')], 36 env.File('ppapi_ppb_audio.html')],
37 browser_flags=['--enable-pepper-testing']) 37 browser_flags=['--enable-pepper-testing'])
38 38
39 # Though this tests passes locally, it does not pass on the Windows 39 # Though this tests passes locally, it does not pass on the Windows
40 # and Linux buildbots, which do not have audio devices. Although 40 # and Linux buildbots, which do not have audio devices. Although
41 # StartPlayback() and StopPlayback() succeed, the audio callback is 41 # StartPlayback() and StopPlayback() succeed, the audio callback is
42 # not called. However, this does work on the Mac buildbots. 42 # not called. However, this does work on the Mac buildbots.
43 is_broken = env.PPAPIBrowserTesterIsBroken() or not env.Bit('host_mac') 43 is_broken = env.PPAPIBrowserTesterIsBroken() or not env.Bit('host_mac')
44 env.AddNodeToTestSuite(node, 44 env.AddNodeToTestSuite(node,
45 ['chrome_browser_tests'], 45 ['chrome_browser_tests'],
46 'run_ppapi_ppb_audio_browser_test', 46 'run_ppapi_ppb_audio_browser_test',
47 is_broken=is_broken) 47 is_broken=is_broken)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698