diff options
| author | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 20:00:33 +0000 |
|---|---|---|
| committer | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 20:00:33 +0000 |
| commit | dc38f59ed81c0aa677961c8853813de0dc8ff939 (patch) | |
| tree | 9398037639f089d1e7e8bd3153893441930d1283 /ppapi/native_client | |
| parent | d67a0aa8d08384933b122743339a5d3bc251a882 (diff) | |
| download | chromium_src-dc38f59ed81c0aa677961c8853813de0dc8ff939.zip chromium_src-dc38f59ed81c0aa677961c8853813de0dc8ff939.tar.gz chromium_src-dc38f59ed81c0aa677961c8853813de0dc8ff939.tar.bz2 | |
Port some nacl_integration tests to use autogenerated NMF
with the "nmf_names" SCons construct. Use ProgramNameForNmf
to generate nexe/pexe names, so that they will work with
PNaCl pexes.
This will break "tests/examples.html", since the NMF files
are no longer staged (some complication with SCons trying to
generate the same NMF file for different test nodes), but it
looks like "tests/examples.html" will no longer be used in
manual testing. Confirmed with Noel that only the SDK
examples plus existing published Apps will be manually
tried. We may be able to clean out the examples.html file later.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2609
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2645
TEST= trybots
Review URL: https://chromiumcodereview.appspot.com/9834030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
78 files changed, 127 insertions, 439 deletions
diff --git a/ppapi/native_client/tests/earth/earth_c.nmf b/ppapi/native_client/tests/earth/earth_c.nmf deleted file mode 100644 index 8e38c12..0000000 --- a/ppapi/native_client/tests/earth/earth_c.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "earth_c_x86-32.nexe"}, - "x86-64": {"url": "earth_c_x86-64.nexe"}, - "arm": {"url": "earth_c_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/earth/earth_cc.nmf b/ppapi/native_client/tests/earth/earth_cc.nmf deleted file mode 100644 index c83768c..0000000 --- a/ppapi/native_client/tests/earth/earth_cc.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "earth_cc_x86-32.nexe"}, - "x86-64": {"url": "earth_cc_x86-64.nexe"}, - "arm": {"url": "earth_cc_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/earth/nacl.scons b/ppapi/native_client/tests/earth/nacl.scons index fd75ed8..bc98cfe 100644 --- a/ppapi/native_client/tests/earth/nacl.scons +++ b/ppapi/native_client/tests/earth/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -15,7 +15,7 @@ earthlib = env.ComponentLibrary('earthlib', ['earth.cc']) # build, C then C++ cobj=['pepper_c.c'] -c_nexe_name = 'earth_c_%s' % env.get('TARGET_FULLARCH') +c_nexe_name = env.ProgramNameForNmf('earth_c') cnexe = env.ComponentProgram(c_nexe_name, cobj, EXTRA_LIBS=['earthlib', '${PPAPI_LIBS}', @@ -27,7 +27,7 @@ node = env.DemoSelLdrNacl('demo_earth_c', cnexe, args=[]) Alias('demo_earth_c', node) ccobj=['pepper_cc.cc'] -cc_nexe_name = 'earth_cc_%s' % env.get('TARGET_FULLARCH') +cc_nexe_name = env.ProgramNameForNmf('earth_cc') ccnexe = env.ComponentProgram(cc_nexe_name, ccobj, EXTRA_LIBS=['earthlib', '${PPAPI_LIBS}', @@ -56,32 +56,23 @@ if not env.Bit('nacl_glibc'): env.AddNodeToTestSuite(node, ['validator_tests', 'small_tests'], 'run_earth_cc') -# TODO(robertm): enable arm support ASAP -if env.Bit('target_arm'): - Return() # browser tests, C then C++ node = env.PPAPIBrowserTester( 'earth_browser_test_c.out', url='earth_c.html', - nmfs=['earth_c.nmf'], - files=[cnexe, - env.File('earth_c.html'), - env.File('earth_c.nmf'), - ] - ) + nmf_names=['earth_c'], + files=env.ExtractPublishedFiles(c_nexe_name), + is_broken=env.PPAPIBrowserTesterIsBroken()) env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'earth_browser_test_c') node = env.PPAPIBrowserTester( 'earth_browser_test_cc.out', url='earth_cc.html', - nmfs=['earth_cc.nmf'], - files=[ccnexe, - env.File('earth_cc.html'), - env.File('earth_cc.nmf'), - ] - ) + nmf_names=['earth_cc'], + files=env.ExtractPublishedFiles(cc_nexe_name), + is_broken=env.PPAPIBrowserTesterIsBroken()) env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'earth_browser_test_cc') diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons index 9f7b8d5..745fc14 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -34,7 +34,7 @@ ppapi_bad_files = [ ] ppapi_bad = env.Replicate('${STAGING_DIR}', ppapi_bad_files) -nmfs = [] +nmf_names = [] # Compile all nexes embedded into the above html for kind in [ 'ppp_initialize', 'ppp_initialize_crash', 'no_ppp_instance', 'get_ppp_instance_crash', @@ -42,15 +42,15 @@ for kind in [ 'ppp_initialize', 'ppp_initialize_crash', 'ppp_instance_didcreate', 'ppp_instance_didcreate_crash', 'event_replay_crash' ]: - bad_nmf = '${TEST_DIR}/ppapi_bad_%s.nmf' % kind - bad_nexe = ('ppapi_bad_%s_%s' % (kind, env.get('TARGET_FULLARCH'))) + bad_nmf = 'ppapi_bad_%s' % kind + bad_nexe = env.ProgramNameForNmf('ppapi_bad_%s' % kind) env.ComponentProgram(bad_nexe, ['ppapi_bad_%s.cc' % kind], EXTRA_LIBS=['${PPAPI_LIBS}', 'platform', 'pthread', 'gio']) - nmfs.append(bad_nmf) + nmf_names.append(bad_nmf) ppapi_bad_files.extend(env.ExtractPublishedFiles(bad_nexe)) env.Depends(ppapi_bad, env.Alias(bad_nexe)) @@ -61,7 +61,7 @@ env.Alias('ppapi_bad', ppapi_bad) node = env.PPAPIBrowserTester( 'ppapi_bad_browser_test.out', url='ppapi_bad.html', - nmfs=nmfs, + nmf_names=nmf_names, files=[env.File(f) for f in ppapi_bad_files], args=['--allow_404']) @@ -72,7 +72,7 @@ env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'run_ppapi_bad_browser_test', is_broken=env.PPAPIBrowserTesterIsBroken() or - env.Bit('host_windows') or + env.Bit('host_windows') or env.Bit('running_on_valgrind')) @@ -121,5 +121,3 @@ env.AddNodeToTestSuite(node, 'run_ppapi_bad_native_test', is_broken=env.PPAPIBrowserTesterIsBroken() or env.Bit('bitcode')) - - diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_doesnotexist.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_doesnotexist.nmf index fef6a67..fed4d1e 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_doesnotexist.nmf +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_doesnotexist.nmf @@ -3,6 +3,6 @@ "x86-32": {"url": "doesnotexist.nexe"}, "x86-64": {"url": "doesnotexist.nexe"}, "arm": {"url": "doesnotexist.nexe"}, - "portable": {"url": "doesnotexist.pexe"} + "portable": {"pnacl-translate": {"url": "doesnotexist.pexe"}} } } diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.nmf deleted file mode 100644 index 4f928cd..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_event_replay_crash.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_event_replay_crash_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_event_replay_crash_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_event_replay_crash_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.nmf deleted file mode 100644 index 7d3a323..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_get_ppp_instance_crash_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_get_ppp_instance_crash_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_get_ppp_instance_crash_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.nmf deleted file mode 100644 index e95eea4..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_get_ppp_messaging_crash_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_get_ppp_messaging_crash_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_get_ppp_messaging_crash_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.nmf deleted file mode 100644 index cbbe68e..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_get_ppp_printing_crash_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_get_ppp_printing_crash_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_get_ppp_printing_crash_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.nmf deleted file mode 100644 index df93186..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_no_ppp_instance_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_no_ppp_instance_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_no_ppp_instance_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize.nmf deleted file mode 100644 index 0e62793..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_ppp_initialize_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_ppp_initialize_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_ppp_initialize_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.nmf deleted file mode 100644 index 0dc3301..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_ppp_initialize_crash_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_ppp_initialize_crash_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_ppp_initialize_crash_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.nmf deleted file mode 100644 index 0c00062..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_ppp_instance_didcreate_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_ppp_instance_didcreate_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_ppp_instance_didcreate_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.nmf deleted file mode 100644 index 0b4346b..0000000 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_bad_ppp_instance_didcreate_crash_x86-32.nexe"}, - "x86-64": {"url": "ppapi_bad_ppp_instance_didcreate_crash_x86-64.nexe"}, - "arm": {"url": "ppapi_bad_ppp_instance_didcreate_arm_crash.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons b/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons index d9b6a22..07f2bd6 100644 --- a/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -21,9 +21,9 @@ crash_types = ['via_check_failure', 'ppapi_off_main_thread'] published_files = [] -nmfs = [] +nmf_names = [] for crash_type in crash_types: - nexe = 'ppapi_crash_%s_%s' % (crash_type, env.get('TARGET_FULLARCH')) + nexe = env.ProgramNameForNmf('ppapi_crash_%s' % crash_type) env.Alias('ppapi_crash_%s${PROGSUFFIX}' % crash_type, ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -39,7 +39,7 @@ for crash_type in crash_types: # TODO(polina): follow ppapi_browser/bad nacl.scons to publish html only once # and to associate all nexes and nmf files with one target that can be # referenced in tests/nacl.scons. - nmfs.append('${TEST_DIR}/ppapi_crash_%s.nmf' % crash_type) + nmf_names.append('ppapi_crash_%s' % crash_type) env.Publish(nexe, 'run', ['ppapi_crash.html']) @@ -47,7 +47,7 @@ for crash_type in crash_types: node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out', url='ppapi_crash.html', - nmfs=nmfs, + nmf_names=nmf_names, files=published_files) # This test is failing on Windows: # crbug.com/98721 diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.nmf b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.nmf deleted file mode 100644 index 889c75a..0000000 --- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_crash_in_callback_x86-32.nexe"}, - "x86-64": {"url": "ppapi_crash_in_callback_x86-64.nexe"}, - "arm": {"url": "ppapi_crash_in_callabck.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.nmf b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.nmf deleted file mode 100644 index 322389f..0000000 --- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_crash_off_main_thread_x86-32.nexe"}, - "x86-64": {"url": "ppapi_crash_off_main_thread_x86-64.nexe"}, - "arm": {"url": "ppapi_crash_off_main_thread_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.nmf b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.nmf deleted file mode 100644 index 56aa503..0000000 --- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_crash_ppapi_off_main_thread_x86-32.nexe"}, - "x86-64": {"url": "ppapi_crash_ppapi_off_main_thread_x86-64.nexe"}, - "arm": {"url": "ppapi_crash_ppapi_off_main_thread_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.nmf b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.nmf deleted file mode 100644 index a7850d1..0000000 --- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_crash_via_check_failure_x86-32.nexe"}, - "x86-64": {"url": "ppapi_crash_via_check_failure_x86-64.nexe"}, - "arm": {"url": "ppapi_crash_via_check_failure_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.nmf b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.nmf deleted file mode 100644 index a42a8e0..0000000 --- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_crash_via_exit_call_x86-32.nexe"}, - "x86-64": {"url": "ppapi_crash_via_exit_call_x86-64.nexe"}, - "arm": {"url": "ppapi_crash_via_exit_call_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons index a6fce2d..114f87a 100644 --- a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -10,11 +10,16 @@ Import('env') +# TODO(jvoung): Make a pnacl version of the nmf / or make the pexe generator +# compatible with CopyLibsForExtension(). +if env.Bit('pnacl_generate_pexe'): + Return() + env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'extension_mime_handler') -nexe = 'ppapi_extension_mime_handler_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_extension_mime_handler') env.ComponentProgram( nexe, diff --git a/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons b/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons index 51edd64..e16617b 100644 --- a/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,8 +13,7 @@ env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + manifest_good_sources = env.ComponentObject('manifest_good.cc'), -manifest_good_target = ('manifest_good_%s' % - env.get('TARGET_FULLARCH')) +manifest_good_target = env.ProgramNameForNmf('manifest_good') env.ComponentProgram(manifest_good_target, [manifest_good_sources], EXTRA_LIBS=['${PPAPI_LIBS}', @@ -25,8 +24,7 @@ env.ComponentProgram(manifest_good_target, manifest_bad_sources = env.ComponentObject('manifest_bad.cc'), -manifest_bad_target = ('manifest_bad_%s' % - env.get('TARGET_FULLARCH')) +manifest_bad_target = env.ProgramNameForNmf('manifest_bad') env.ComponentProgram(manifest_bad_target, [manifest_bad_sources], EXTRA_LIBS=['${PPAPI_LIBS}', diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons index 68c4ae3..50f922d 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_core/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_core') -nexe = 'ppapi_ppb_core_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_core') env.Alias('ppapi_ppb_core${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -32,7 +32,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_core_browser_test.out', url='ppapi_ppb_core.html', - nmfs=['${TEST_DIR}/ppapi_ppb_core.nmf'], + nmf_names=['ppapi_ppb_core'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.nmf deleted file mode 100644 index 0db3b00..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_core_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_core_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_core_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons index 235d957..eb51898 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_dev/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_dev') -nexe = 'ppapi_ppb_dev_${TARGET_FULLARCH}' +nexe = env.ProgramNameForNmf('ppapi_ppb_dev') env.Alias('ppapi_ppb_dev${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -32,7 +32,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_dev_browser_test.out', url='ppapi_ppb_dev.html', - nmfs=['${TEST_DIR}/ppapi_ppb_dev.nmf'], + nmf_names=['ppapi_ppb_dev'], files=env.ExtractPublishedFiles(nexe), args=['--enable_ppapi_dev=0']) diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.nmf deleted file mode 100644 index 37180ae..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_dev_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_dev_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_dev_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons index 0a7af63..8972eac 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_file_io') -nexe = 'ppapi_ppb_file_io_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_file_io') env.Alias('ppapi_ppb_file_io${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -34,7 +34,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_file_io_browser_test.out', url='ppapi_ppb_file_io.html', - nmfs=['${TEST_DIR}/ppapi_ppb_file_io.nmf'], + nmf_names=['ppapi_ppb_file_io'], browser_flags=['--unlimited-quota-for-files'], files=env.ExtractPublishedFiles(nexe)) diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.nmf deleted file mode 100644 index b19036f..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_file_io/ppapi_ppb_file_io.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": { "url": "ppapi_ppb_file_io_x86-32.nexe" }, - "x86-64": { "url": "ppapi_ppb_file_io_x86-64.nexe" }, - "arm": { "url": "ppapi_ppb_file_io_arm.nexe" } - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons index c2a68c8..e292f02 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_file_system/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_file_system') -nexe = 'ppapi_ppb_file_system_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_file_system') env.Alias('ppapi_ppb_file_system${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -29,7 +29,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_file_system_browser_test.out', url='ppapi_ppb_file_system.html', - nmfs=['${TEST_DIR}/ppapi_ppb_file_system.nmf'], + nmf_names=['ppapi_ppb_file_system'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.nmf deleted file mode 100644 index 699ee05..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_file_system/ppapi_ppb_file_system.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": { "url": "ppapi_ppb_file_system_x86-32.nexe" }, - "x86-64": { "url": "ppapi_ppb_file_system_x86-64.nexe" }, - "arm": { "url": "ppapi_ppb_file_system_arm.nexe" } - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/nacl.scons index 6def0cf..0d4f219 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_fullscreen') -nexe = 'ppapi_ppb_fullscreen_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_fullscreen') env.Alias('ppapi_ppb_fullscreen${PROGSUFFIX}', [ '$STAGING_DIR/%s${PROGSUFFIX}' % nexe ]) @@ -30,7 +30,7 @@ env.Publish(nexe, 'run', 'ppapi_ppb_fullscreen.js']) node = env.PPAPIBrowserTester('ppapi_ppb_fullscreen_browser_test.out', - nmfs=['${TEST_DIR}/ppapi_ppb_fullscreen.nmf'], + nmf_names=['ppapi_ppb_fullscreen'], url='ppapi_ppb_fullscreen.html', files=env.ExtractPublishedFiles(nexe), browser_flags=['--enable-pepper-testing']) diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.nmf deleted file mode 100644 index 1c9ad95..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_fullscreen/ppapi_ppb_fullscreen.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": { "url": "ppapi_ppb_fullscreen_x86-32.nexe" }, - "x86-64": { "url": "ppapi_ppb_fullscreen_x86-64.nexe" }, - "arm": { "url": "ppapi_ppb_fullscreen_arm.nexe" } - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons index 4d4ed4e..f689efa 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_graphics2d') -nexe = 'ppapi_ppb_graphics2d_${TARGET_FULLARCH}' +nexe = env.ProgramNameForNmf('ppapi_ppb_graphics2d') env.Alias('ppapi_ppb_graphics2d${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -33,7 +33,7 @@ dest_copy = env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_graphics2d_browser_test.out', url='ppapi_ppb_graphics2d.html', - nmfs=['${TEST_DIR}/ppapi_ppb_graphics2d.nmf'], + nmf_names=['ppapi_ppb_graphics2d'], files=[ ppapi_ppb_graphics2d_nexe, env.File('ppapi_ppb_graphics2d.html')], browser_flags=['--enable-pepper-testing']) diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/ppapi_ppb_graphics2d.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/ppapi_ppb_graphics2d.nmf deleted file mode 100644 index e4d8b1f..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/ppapi_ppb_graphics2d.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_graphics2d_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_graphics2d_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_graphics2d_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons index 5a9c8e0..70fba04 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -13,7 +13,7 @@ env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include']) -nexe = 'ppapi_ppb_graphics3d_${TARGET_FULLARCH}' +nexe = env.ProgramNameForNmf('ppapi_ppb_graphics3d') env.Alias('ppapi_ppb_graphics3d${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -35,7 +35,7 @@ dest_copy = env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out', url='ppapi_ppb_graphics3d.html', - nmfs=['${TEST_DIR}/ppapi_ppb_graphics3d.nmf'], + nmf_names=['ppapi_ppb_graphics3d'], files=[ ppapi_ppb_graphics3d_nexe, env.File('ppapi_ppb_graphics3d.html')], browser_flags=['--enable-accelerated-plugins']) diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/ppapi_ppb_graphics3d.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/ppapi_ppb_graphics3d.nmf deleted file mode 100644 index 34e9ec0..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/ppapi_ppb_graphics3d.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_graphics3d_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_graphics3d_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_graphics3d_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons index 33a01f3..c0eca25 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_image_data') -nexe = 'ppapi_ppb_image_data_${TARGET_FULLARCH}' +nexe = env.ProgramNameForNmf('ppapi_ppb_image_data') env.Alias('ppapi_ppb_image_data${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -32,7 +32,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_image_data_browser_test.out', url='ppapi_ppb_image_data.html', - nmfs=['${TEST_DIR}/ppapi_ppb_image_data.nmf'], + nmf_names=['ppapi_ppb_image_data'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_image_data/ppapi_ppb_image_data.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_image_data/ppapi_ppb_image_data.nmf deleted file mode 100644 index fc7b568..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_image_data/ppapi_ppb_image_data.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_image_data_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_image_data_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_image_data_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons index 30d8e1f..0a1078e 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_instance/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_instance') -nexe = 'ppapi_ppb_instance_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_instance') env.Alias('ppapi_ppb_instance${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) env.ComponentProgram( @@ -25,13 +25,11 @@ env.ComponentProgram( # Note that the html is required to run this program. env.Publish(nexe, 'run', - ['ppapi_ppb_instance.html', - env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' - 'browserdata/nacltest.js')]) + ['ppapi_ppb_instance.html']) node = env.PPAPIBrowserTester('ppapi_ppb_instance_browser_test.out', url='ppapi_ppb_instance.html', - nmfs=['${TEST_DIR}/ppapi_ppb_instance.nmf'], + nmf_names=['ppapi_ppb_instance'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.nmf deleted file mode 100644 index 456c513..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_instance_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_instance_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_instance_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons index b16f01f..e9bb03b 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_memory/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_memory') -nexe = 'ppapi_ppb_memory_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_memory') env.Alias('ppapi_ppb_memory${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -30,7 +30,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_memory_browser_test.out', url='ppapi_ppb_memory.html', - nmfs=['${TEST_DIR}/ppapi_ppb_memory.nmf'], + nmf_names=['ppapi_ppb_memory'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_memory/ppapi_ppb_memory.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_memory/ppapi_ppb_memory.nmf deleted file mode 100644 index de18f8a..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_memory/ppapi_ppb_memory.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_memory_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_memory_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_memory_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons index a1337ba..b7706bd 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_pdf/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -10,7 +10,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_pdf') -nexe = 'ppapi_ppb_pdf_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_pdf') env.Alias('ppapi_ppb_pdf${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -30,7 +30,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_pdf_browser_test.out', url='ppapi_ppb_pdf.html', - nmfs=['${TEST_DIR}/ppapi_ppb_pdf.nmf'], + nmf_names=['ppapi_ppb_pdf'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_pdf/ppapi_ppb_pdf.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_pdf/ppapi_ppb_pdf.nmf deleted file mode 100644 index 96c2636..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_pdf/ppapi_ppb_pdf.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_pdf_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_pdf_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_pdf_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons index 86436f2..5e86822 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -10,7 +10,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_scrollbar') -nexe = 'ppapi_ppb_scrollbar_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_scrollbar') env.Alias('ppapi_ppb_scrollbar${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -30,7 +30,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_scrollbar_browser_test.out', url='ppapi_ppb_scrollbar.html', - nmfs=['${TEST_DIR}/ppapi_ppb_scrollbar.nmf'], + nmf_names=['ppapi_ppb_scrollbar'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.nmf deleted file mode 100644 index 7bbd667..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_scrollbar_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_scrollbar_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_scrollbar_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons index 9308de2..61d75b5 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_url_loader') -nexe = 'ppapi_ppb_url_loader_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_url_loader') env.Alias('ppapi_ppb_url_loader${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -30,7 +30,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_url_loader_browser_test.out', url='ppapi_ppb_url_loader.html', - nmfs=['${TEST_DIR}/ppapi_ppb_url_loader.nmf'], + nmf_names=['ppapi_ppb_url_loader'], files=env.ExtractPublishedFiles(nexe), args=['--allow_404', '--redirect_url', diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/ppapi_ppb_url_loader.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/ppapi_ppb_url_loader.nmf deleted file mode 100644 index 1a42c09..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_url_loader/ppapi_ppb_url_loader.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": { "url": "ppapi_ppb_url_loader_x86-32.nexe" }, - "x86-64": { "url": "ppapi_ppb_url_loader_x86-64.nexe" }, - "arm": { "url": "ppapi_ppb_url_loader_arm.nexe" } - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons index 6000b87..83e0583 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_url_request_info') -nexe = 'ppapi_ppb_url_request_info_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_url_request_info') env.Alias('ppapi_ppb_url_request_info${PROGSUFFIX}', [ '$STAGING_DIR/%s${PROGSUFFIX}' % nexe ]) @@ -32,7 +32,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester( 'ppapi_ppb_url_request_info_browser_test.out', url='ppapi_ppb_url_request_info.html', - nmfs=['${TEST_DIR}/ppapi_ppb_url_request_info.nmf'], + nmf_names=['ppapi_ppb_url_request_info'], files=env.ExtractPublishedFiles(nexe), browser_flags=['--enable-pepper-testing']) diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.nmf deleted file mode 100644 index 1d836a6..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": { "url": "ppapi_ppb_url_request_info_x86-32.nexe" }, - "x86-64": { "url": "ppapi_ppb_url_request_info_x86-64.nexe" }, - "arm": { "url": "ppapi_ppb_url_request_info_arm.nexe" } - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons index e08d352..6a4a9ce 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_var/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_var') -nexe = 'ppapi_ppb_var_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_var') env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) env.ComponentProgram( @@ -31,7 +31,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out', url='ppapi_ppb_var.html', - nmfs=['${TEST_DIR}/ppapi_ppb_var.nmf'], + nmf_names=['ppapi_ppb_var'], files=env.ExtractPublishedFiles(nexe)) # TODO(ncbray) Flaky on Win XP. Fix. diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_var/ppapi_ppb_var.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_var/ppapi_ppb_var.nmf deleted file mode 100644 index cfd1ae4..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_var/ppapi_ppb_var.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_var_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_var_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_var_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons index 5ec2571..587c62b 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppb_widget/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -10,7 +10,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppb_widget') -nexe = 'ppapi_ppb_widget_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppb_widget') env.Alias('ppapi_ppb_widget${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -30,7 +30,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppb_widget_browser_test.out', url='ppapi_ppb_widget.html', - nmfs=['${TEST_DIR}/ppapi_ppb_widget.nmf'], + nmf_names=['ppapi_ppb_widget'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_widget/ppapi_ppb_widget.nmf b/ppapi/native_client/tests/ppapi_browser/ppb_widget/ppapi_ppb_widget.nmf deleted file mode 100644 index 8e47490..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppb_widget/ppapi_ppb_widget.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppb_widget_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppb_widget_x86-64.nexe"}, - "arm": {"url": "ppapi_ppb_widget_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons index 3ae4482..3947b14 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppp_input_event/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppp_input_event') -nexe = 'ppapi_ppp_input_event_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppp_input_event') env.Alias('ppapi_ppp_input_event${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -31,7 +31,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppp_input_event_browser_test.out', url='ppapi_ppp_input_event.html', - nmfs=['${TEST_DIR}/ppapi_ppp_input_event.nmf'], + nmf_names=['ppapi_ppp_input_event'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_input_event/ppapi_ppp_input_event.nmf b/ppapi/native_client/tests/ppapi_browser/ppp_input_event/ppapi_ppp_input_event.nmf deleted file mode 100644 index 6063dc7..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppp_input_event/ppapi_ppp_input_event.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppp_input_event_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppp_input_event_x86-64.nexe"}, - "arm": {"url": "ppapi_ppp_input_event_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons index 93fc5ad..9827d37 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 'ppp_instance') -nexe = 'ppapi_ppp_instance_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_ppp_instance') env.Alias('ppapi_ppp_instance${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -31,7 +31,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_ppp_instance_browser_test.out', url='ppapi_ppp_instance.html', - nmfs=['${TEST_DIR}/ppapi_ppp_instance.nmf'], + nmf_names=['ppapi_ppp_instance'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.nmf b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.nmf deleted file mode 100644 index 38b768f..0000000 --- a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_ppp_instance_x86-32.nexe"}, - "x86-64": {"url": "ppapi_ppp_instance_x86-64.nexe"}, - "arm": {"url": "ppapi_ppp_instance_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons b/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons index a16e3bf..2b5709b 100644 --- a/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,8 +13,7 @@ env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'), -progress_events_target = ('ppapi_progress_events_%s' % - env.get('TARGET_FULLARCH')) +progress_events_target = env.ProgramNameForNmf('ppapi_progress_events') env.ComponentProgram(progress_events_target, [progress_events_sources], EXTRA_LIBS=['${PPAPI_LIBS}', @@ -34,7 +33,7 @@ env.Publish(progress_events_target, 'run', [ node = env.PPAPIBrowserTester( 'ppapi_progress_events_browser_test.out', url='ppapi_progress_events.html', - nmfs=['${TEST_DIR}/ppapi_progress_events.nmf'], + nmf_names=['ppapi_progress_events'], files=env.ExtractPublishedFiles(progress_events_target)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_browser/progress_events/ppapi_progress_events.nmf b/ppapi/native_client/tests/ppapi_browser/progress_events/ppapi_progress_events.nmf deleted file mode 100644 index d4d05ca..0000000 --- a/ppapi/native_client/tests/ppapi_browser/progress_events/ppapi_progress_events.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_progress_events_x86-32.nexe"}, - "x86-64": {"url": "ppapi_progress_events_x86-64.nexe"}, - "arm": {"url": "ppapi_progress_events_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_browser/stress_many_nexes/nacl.scons b/ppapi/native_client/tests/ppapi_browser/stress_many_nexes/nacl.scons index a961c0e..486b8d7 100644 --- a/ppapi/native_client/tests/ppapi_browser/stress_many_nexes/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/stress_many_nexes/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,6 +13,10 @@ stress_files = [ replicated_files = env.Replicate('${STAGING_DIR}', stress_files) env.Alias('all_programs', replicated_files) +# NOTE: Since NMFs are now autogenerated there is no ppapi_ppb_core.nmf +# file that is checked-in and staged anymore. This test will need to +# be converted to have its own nexe and its own nmf if we ever choose +# to enable it (is_broken=True below). core = env.File('${STAGING_DIR}/ppapi_ppb_core_${TARGET_FULLARCH}${PROGSUFFIX}') nmf = env.File('${STAGING_DIR}/ppapi_ppb_core.nmf') stress_files.extend([core, nmf]) diff --git a/ppapi/native_client/tests/ppapi_example_2d/nacl.scons b/ppapi/native_client/tests/ppapi_example_2d/nacl.scons index 04c0682..c3dda6f 100644 --- a/ppapi/native_client/tests/ppapi_example_2d/nacl.scons +++ b/ppapi/native_client/tests/ppapi_example_2d/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -9,7 +9,7 @@ Import('env') env.Prepend(CPPDEFINES=['XP_UNIX']) -nexe_name = 'ppapi_example_2d_%s' % env.get('TARGET_FULLARCH') +nexe_name = env.ProgramNameForNmf('ppapi_example_2d') obj = env.ComponentObject( 'graphics_2d_example', '$SOURCE_ROOT/ppapi/examples/2d/graphics_2d_example.c' diff --git a/ppapi/native_client/tests/ppapi_example_audio/nacl.scons b/ppapi/native_client/tests/ppapi_example_audio/nacl.scons index 8ee755c..3b3c116 100644 --- a/ppapi/native_client/tests/ppapi_example_audio/nacl.scons +++ b/ppapi/native_client/tests/ppapi_example_audio/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 'ppapi_example_audio/') -nexe_name = 'ppapi_example_audio_%s' % env.get('TARGET_FULLARCH') +nexe_name = env.ProgramNameForNmf('ppapi_example_audio') nexe = env.ComponentProgram(nexe_name, [ 'audio.cc' ], EXTRA_LIBS=['${PPAPI_LIBS}', @@ -27,10 +27,8 @@ env.Publish(nexe_name, 'run', test = env.PPAPIBrowserTester('ppapi_example_audio_test.out', url='ppapi_example_audio.html#mute', - nmfs=['${TEST_DIR}/ppapi_example_audio.nmf'], - files=[nexe, - env.File('ppapi_example_audio.nmf'), - env.File('ppapi_example_audio.html')]) + nmf_names=['ppapi_example_audio'], + files=env.ExtractPublishedFiles(nexe_name)) # Though this tests passes locally, it does not pass on the Windows # and Linux buildbots, which do not have audio devices. Although diff --git a/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.nmf b/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.nmf deleted file mode 100644 index 2cdea3d..0000000 --- a/ppapi/native_client/tests/ppapi_example_audio/ppapi_example_audio.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_example_audio_x86-32.nexe"}, - "x86-64": {"url": "ppapi_example_audio_x86-64.nexe"}, - "arm": {"url": "ppapi_example_audio_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_example_events/nacl.scons b/ppapi/native_client/tests/ppapi_example_events/nacl.scons index 36f4946..8b28c2c 100644 --- a/ppapi/native_client/tests/ppapi_example_events/nacl.scons +++ b/ppapi/native_client/tests/ppapi_example_events/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -9,7 +9,7 @@ Import('env') env.FilterOut(CFLAGS=['-pedantic']) env.FilterOut(CCFLAGS=['-pedantic']) -nexe = 'ppapi_example_events_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_example_events') env.Alias('ppapi_example_events${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) ppapi_example_events_nexe = env.ComponentProgram(nexe, diff --git a/ppapi/native_client/tests/ppapi_example_font/nacl.scons b/ppapi/native_client/tests/ppapi_example_font/nacl.scons index baeae78..93146ad 100644 --- a/ppapi/native_client/tests/ppapi_example_font/nacl.scons +++ b/ppapi/native_client/tests/ppapi_example_font/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -16,7 +16,7 @@ env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + env.FilterOut(CCFLAGS=['-Werror', '-pedantic']) env.Append(CCFLAGS=['-Wformat=0']) -nexe_name = 'ppapi_example_font_${TARGET_FULLARCH}' +nexe_name = env.ProgramNameForNmf('ppapi_example_font') obj = env.ComponentObject( 'simple_font', '$SOURCE_ROOT/ppapi/examples/font/simple_font.cc' @@ -30,7 +30,7 @@ env.Publish(nexe_name, 'run', test = env.PPAPIBrowserTester('ppapi_example_font_test.out', url='ppapi_example_font.html', - nmfs=['${TEST_DIR}/ppapi_example_font.nmf'], + nmf_names=['ppapi_example_font'], files=env.ExtractPublishedFiles(nexe_name)) env.AddNodeToTestSuite(test, diff --git a/ppapi/native_client/tests/ppapi_example_font/ppapi_example_font.nmf b/ppapi/native_client/tests/ppapi_example_font/ppapi_example_font.nmf deleted file mode 100644 index 4757f79..0000000 --- a/ppapi/native_client/tests/ppapi_example_font/ppapi_example_font.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_example_font_x86-32.nexe"}, - "x86-64": {"url": "ppapi_example_font_x86-64.nexe"}, - "arm": {"url": "ppapi_example_font_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons b/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons index fbe7ede..e05af4e 100644 --- a/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons +++ b/ppapi/native_client/tests/ppapi_example_gles2/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -12,7 +12,7 @@ env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 'ppapi_example_gles2/') -nexe_name = 'ppapi_example_gles2_%s' % env.get('TARGET_FULLARCH') +nexe_name = env.ProgramNameForNmf('ppapi_example_gles2') obj = env.ComponentObject( 'gles2', '$SOURCE_ROOT/ppapi/examples/gles2/gles2.cc' @@ -26,7 +26,7 @@ env.Publish(nexe_name, 'run', test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out', url='ppapi_example_gles2.html', - nmfs=['${TEST_DIR}/ppapi_example_gles2.nmf'], + nmf_names=['ppapi_example_gles2'], files=env.ExtractPublishedFiles(nexe_name), args=['--enable_experimental_js']) diff --git a/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.nmf b/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.nmf deleted file mode 100644 index 3f5ebe8..0000000 --- a/ppapi/native_client/tests/ppapi_example_gles2/ppapi_example_gles2.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_example_gles2_x86-32.nexe"}, - "x86-64": {"url": "ppapi_example_gles2_x86-64.nexe"}, - "arm": {"url": "ppapi_example_gles2_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons b/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons index 663f46e..1ef6691 100644 --- a/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons +++ b/ppapi/native_client/tests/ppapi_example_post_message/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,7 +11,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 'ppapi_example_post_message/') -nexe_name = 'ppapi_example_post_message_${TARGET_FULLARCH}' +nexe_name = env.ProgramNameForNmf('ppapi_example_post_message') obj = env.ComponentObject( 'post_message', '$SOURCE_ROOT/ppapi/examples/scripting/post_message.cc' @@ -27,7 +27,7 @@ env.Publish(nexe_name, 'run', test = env.PPAPIBrowserTester( 'ppapi_example_post_message_test.out', url='ppapi_example_post_message.html', - nmfs=['${TEST_DIR}/ppapi_example_post_message.nmf'], + nmf_names=['ppapi_example_post_message'], files=env.ExtractPublishedFiles(nexe_name)) env.AddNodeToTestSuite(test, diff --git a/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.nmf b/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.nmf deleted file mode 100644 index 0dafadf..0000000 --- a/ppapi/native_client/tests/ppapi_example_post_message/ppapi_example_post_message.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_example_post_message_x86-32.nexe"}, - "x86-64": {"url": "ppapi_example_post_message_x86-64.nexe"}, - "arm": {"url": "ppapi_example_post_message_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_geturl/nacl.scons b/ppapi/native_client/tests/ppapi_geturl/nacl.scons index 1cc67b5..093b2e6 100644 --- a/ppapi/native_client/tests/ppapi_geturl/nacl.scons +++ b/ppapi/native_client/tests/ppapi_geturl/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -21,7 +21,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 'ppapi_geturl/') -nexe = 'ppapi_geturl_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_geturl') env.Alias('ppapi_geturl${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -47,7 +47,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_geturl_browser_test.out', url='ppapi_geturl.html', - nmfs=['${TEST_DIR}/ppapi_geturl.nmf'], + nmf_names=['ppapi_geturl'], files=env.ExtractPublishedFiles(nexe), args=['--allow_404'], ) diff --git a/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.nmf b/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.nmf deleted file mode 100644 index 948f8c7..0000000 --- a/ppapi/native_client/tests/ppapi_geturl/ppapi_geturl.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_geturl_x86-32.nexe"}, - "x86-64": {"url": "ppapi_geturl_x86-64.nexe"}, - "arm": {"url": "ppapi_geturl_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons index 7caf477..c4cf3e3 100644 --- a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons +++ b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2011 The Native Client Authors. All rights reserved. +# Copyright 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can # be found in the LICENSE file. @@ -57,8 +57,7 @@ gles_book_examples = { } for demo, sources in gles_book_examples.iteritems(): - nexe_name = ('ppapi_gles_book_%s_%s' - % (demo, env.get('TARGET_FULLARCH'))) + nexe_name = env.ProgramNameForNmf('ppapi_gles_book_%s' % demo) nmf_name = 'ppapi_gles_book_' + demo + '.nmf' nexe = env.ComponentProgram( nexe_name, diff --git a/ppapi/native_client/tests/ppapi_messaging/nacl.scons b/ppapi/native_client/tests/ppapi_messaging/nacl.scons index d57f20f..1f78f7c 100644 --- a/ppapi/native_client/tests/ppapi_messaging/nacl.scons +++ b/ppapi/native_client/tests/ppapi_messaging/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2011 The Native Client Authors. All rights reserved. +# Copyright 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can # be found in the LICENSE file. @@ -16,11 +16,9 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 'ppapi_messaging/') -nexe = 'ppapi_messaging_%s' % env.get('TARGET_FULLARCH') - +nexe = env.ProgramNameForNmf('ppapi_messaging') env.Alias('ppapi_messaging${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) - ppapi_messaging_nexe = env.ComponentProgram(nexe, ['ppapi_messaging.c'], EXTRA_LIBS=['${PPAPI_LIBS}', @@ -30,20 +28,14 @@ ppapi_messaging_nexe = env.ComponentProgram(nexe, 'm', ]) -# Note that the html is required to run this program. -dest_copy = env.Replicate('$STAGING_DIR', - ['ppapi_messaging.html', - env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' - 'browserdata/nacltest.js')] - ) -env.Depends(nexe, dest_copy) +env.Publish(nexe, + 'run', + ['ppapi_messaging.html']) node = env.PPAPIBrowserTester('ppapi_messaging_browser_test.out', url='ppapi_messaging.html', - nmfs=['${TEST_DIR}/ppapi_messaging.nmf'], - files=[ppapi_messaging_nexe, - env.File('ppapi_messaging.nmf'), - env.File('ppapi_messaging.html')]) + nmf_names=['ppapi_messaging'], + files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, ['chrome_browser_tests'], diff --git a/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.nmf b/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.nmf deleted file mode 100644 index 6210896..0000000 --- a/ppapi/native_client/tests/ppapi_messaging/ppapi_messaging.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-64": {"url": "ppapi_messaging_x86-64.nexe"}, - "x86-32": {"url": "ppapi_messaging_x86-32.nexe"}, - "arm": {"url": "ppapi_messaging_arm.nexe"} - } -} diff --git a/ppapi/native_client/tests/ppapi_test_example/nacl.scons b/ppapi/native_client/tests/ppapi_test_example/nacl.scons index cc114c0..b69162b 100644 --- a/ppapi/native_client/tests/ppapi_test_example/nacl.scons +++ b/ppapi/native_client/tests/ppapi_test_example/nacl.scons @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright (c) 2011 The Native Client Authors. All rights reserved. +# Copyright (c) 2012 The Native Client Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -20,7 +20,7 @@ env.Prepend(CPPDEFINES=['XP_UNIX']) env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 'ppapi_test_example/') -nexe = 'ppapi_test_example_%s' % env.get('TARGET_FULLARCH') +nexe = env.ProgramNameForNmf('ppapi_test_example') env.Alias('ppapi_test_example${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) @@ -40,7 +40,7 @@ env.Publish(nexe, 'run', node = env.PPAPIBrowserTester('ppapi_test_example_browser_test.out', url='ppapi_test_example.html', - nmfs=['${TEST_DIR}/ppapi_test_example.nmf'], + nmf_names=['ppapi_test_example'], files=env.ExtractPublishedFiles(nexe)) env.AddNodeToTestSuite(node, diff --git a/ppapi/native_client/tests/ppapi_test_example/ppapi_test_example.nmf b/ppapi/native_client/tests/ppapi_test_example/ppapi_test_example.nmf deleted file mode 100644 index 8d9dd98..0000000 --- a/ppapi/native_client/tests/ppapi_test_example/ppapi_test_example.nmf +++ /dev/null @@ -1,7 +0,0 @@ -{ - "program": { - "x86-32": {"url": "ppapi_test_example_x86-32.nexe"}, - "x86-64": {"url": "ppapi_test_example_x86-64.nexe"}, - "arm": {"url": "ppapi_test_example_arm.nexe"} - } -} |