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

Unified Diff: src/trusted/service_runtime/build.scons

Issue 10512008: Remove some unused code that fails to compile with -Wundef (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | src/trusted/service_runtime/fs/fs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/build.scons
diff --git a/src/trusted/service_runtime/build.scons b/src/trusted/service_runtime/build.scons
index 72dd6cc6d6708693136070014e4cf4c3392a49ce..eaddb5ff21732b43270a77123d34946e7c83de5e 100644
--- a/src/trusted/service_runtime/build.scons
+++ b/src/trusted/service_runtime/build.scons
@@ -274,11 +274,6 @@ env.ComponentLibrary('container',
])
-env.ComponentLibrary('nacl_xdr',
- ['fs/xdr.c',
- 'fs/obj_proxy.c',
- ])
-
# NOTE(robertm): these extra libs were orignially only added to the
# sel_ldr binary
# TODO(robertm): see who really needs them and remove
@@ -779,48 +774,6 @@ if not env.CrossToolsBuild():
is_broken=not os.path.exists(str(auxv_nexe)))
# ----------------------------------------------------------
-# Integration Tests
-# ----------------------------------------------------------
-
-# Doesn't work on windows under coverage.
-# TODO(bradnelson): fix this to work on windows under coverage.
-# NOTE: uses validator
-if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
- not env.CrossToolsBuild()):
- obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ]
- obj_proxy_test = env.ComponentProgram(
- 'obj_proxy_test',
- obj_proxy_test_inputs,
- EXTRA_LIBS=['sel',
- 'env_cleanser',
- 'manifest_proxy',
- 'simple_service',
- 'thread_interface',
- 'gio_wrapped_desc',
- 'nonnacl_srpc',
- 'nrd_xfer',
- 'nacl_perf_counter',
- 'nacl_base',
- 'imc',
- 'nacl_fault_inject',
- 'nacl_interval',
- 'platform',
- 'nacl_xdr',
- 'container',
- ] + DEBUG_LIBS)
-
- node = env.CommandTest(
- 'obj_proxy_test.out',
- # NOTE: this is run out of obj/ rather than staging/
- [obj_proxy_test, '-n', '2048'],
- size='huge')
- # TODO(bsy): change this test to use less time -- most of it (on windows)
- # is in the RNG, so with this will inherently speed up when the RNG is
- # updated.
-
- env.AddNodeToTestSuite(node, ['small_tests'], 'obj_proxy_tests')
-
-# ----------------------------------------------------------
# Integration Tests With Canned x86 Binaries
# ----------------------------------------------------------
# To update the canned tests run:
« no previous file with comments | « no previous file | src/trusted/service_runtime/fs/fs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698