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

Unified Diff: ppapi/native_client/tests/nacl_browser/pnacl_client_translator/nacl.scons

Issue 11145002: Remove more tests from the NaCl SCons build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad test Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/tests/nacl_browser/pnacl_client_translator/nacl.scons
diff --git a/ppapi/native_client/tests/nacl_browser/pnacl_client_translator/nacl.scons b/ppapi/native_client/tests/nacl_browser/pnacl_client_translator/nacl.scons
index 24b8240b477b6e9f3bb088604913424f15ad9ae7..126642b4629273d545cb30ab6d17c1e66d1ded32 100644
--- a/ppapi/native_client/tests/nacl_browser/pnacl_client_translator/nacl.scons
+++ b/ppapi/native_client/tests/nacl_browser/pnacl_client_translator/nacl.scons
@@ -19,46 +19,6 @@ if not (env.Bit('bitcode') and env.Bit('pnacl_generate_pexe')):
if env.Bit('nacl_glibc') and env.Bit('target_x86_64'):
Return()
-#----------------------------------------------------------------------
-# Test pexe translation.
-
-# Specify the object file to prevent junk from getting left over
-# in source directory. SCons will default to point "-o" to the source
-# directory if it is an absolute directory.
-test_example_obj = env.ComponentObject(
- 'pnacl_test_example_obj',
- '${SCONSTRUCT_DIR}/tests/ppapi_test_example/ppapi_test_example.cc')
-
-pexe_name = env.ProgramNameForNmf('pnacl_test_example')
-
-test_example_pexe = env.ComponentProgram(
- pexe_name,
- [test_example_obj],
- EXTRA_LIBS=['ppapi',
- 'ppapi_test_lib',
- 'platform', # for CHECK
- 'pthread',
- 'gio',
- ])
-
-# Grab test routines.
-borrowed_file = '${STAGING_DIR}/ppapi_test_example.js',
-
-env.Publish(pexe_name,
- 'run',
- ['pnacl_test_example.html'])
-
-node = env.PPAPIBrowserTester(
- 'pnacl_test_example.out',
- url='pnacl_test_example.html',
- nmf_names=['pnacl_test_example'],
- files=env.ExtractPublishedFiles(pexe_name) + [borrowed_file])
-
-env.AddNodeToTestSuite(node,
- ['chrome_browser_tests'],
- 'run_pnacl_example_browser_test',
- is_broken=env.PPAPIBrowserTesterIsBroken())
-
#### Test error handling.
# We should add more cases, e.g., try a bad library to crash ld,
@@ -66,6 +26,8 @@ env.AddNodeToTestSuite(node,
# The current llc tests, don't actually crash LLC, they only
# make llc exit w/ an abnormal status.
+program_fragment_obj = env.ComponentObject('program_fragment.cc')
+
pnacl_bad_files = env.Replicate(
'${STAGING_DIR}',
['pnacl_bad_doesnotexist.nmf',
@@ -76,15 +38,11 @@ pnacl_bad_files = env.Replicate(
# This one is the hello world bitcode .ll w/ a missing instruction.
'bad2.pexe',
'pnacl_bad2_pexe.nmf',
- # Borrow the bitcode file from the test above and treat it as a
- # pexe so that the compile succeeds but linking fails.
- 'pnacl_test_example_obj.bc',
+ program_fragment_obj,
'pnacl_bad_pexe_undefined_syms.nmf',
'pnacl_bad_test.html',
])
-env.Depends(pnacl_bad_files, test_example_obj)
-
# Borrow bad load test harness.
borrowed_file = '${STAGING_DIR}/ppapi_bad.js',

Powered by Google App Engine
This is Rietveld 408576698