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/tests/ppapi_gles_book | |
| 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/tests/ppapi_gles_book')
| -rw-r--r-- | ppapi/native_client/tests/ppapi_gles_book/nacl.scons | 5 |
1 files changed, 2 insertions, 3 deletions
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, |