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

Unified Diff: tests/minsfi/nacl.scons

Issue 546883003: MinSFI: Passing arguments to the entry function (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/minsfi/untrusted/start.c ('k') | tests/minsfi/sandbox_invoke_args.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/minsfi/nacl.scons
diff --git a/tests/minsfi/nacl.scons b/tests/minsfi/nacl.scons
index 4230aef8906c3cb288b353f9e9bb477e4ae3c254..79d37f9f4218525ca18cc6012fb018ddbb811c43 100644
--- a/tests/minsfi/nacl.scons
+++ b/tests/minsfi/nacl.scons
@@ -12,12 +12,16 @@ if not env.Bit('bitcode') or not env.Bit('minsfi') or \
not trusted_env.Bit('build_x86') or trusted_env.Bit('windows'):
Return()
-def CompileSandbox(test_name, exerciser_src, sandbox_src, ptrsize=0):
+def CompileSandbox(test_name, exerciser_src, sandbox_src, ptrsize=0,
+ support_lib=True):
if ptrsize == 0:
ptrsize = 24 if trusted_env.Bit('build_x86_32') else 32
bc_env = env.Clone()
bc_env.Replace(CCFLAGS=[], LINKFLAGS=[])
+ if support_lib:
+ bc_env.Append(LIBS=['minsfi_support'])
+ bc_env.Append(LIBS=['c'])
# Compile the untrusted file.
# We cannot pass the source file directly to the ComponentProgram call
@@ -65,5 +69,10 @@ def CompileSandbox(test_name, exerciser_src, sandbox_src, ptrsize=0):
['small_tests', 'toolchain_tests', 'minsfi_tests'],
'run_minsfi_' + test_name + '_test')
-CompileSandbox('memory_layout', 'test_memory_layout.c', 'sandbox_dummy.c')
-CompileSandbox('initializer', 'test_initializer.c', 'sandbox_dummy.c')
+CompileSandbox('memory_layout', 'test_memory_layout.c', 'sandbox_dummy.c',
+ support_lib=False)
+CompileSandbox('initializer', 'test_initializer.c', 'sandbox_dummy.c',
+ support_lib=False)
+CompileSandbox('pointer_conversion', 'test_pointer_conversion.c',
+ 'sandbox_dummy.c', support_lib=False)
+CompileSandbox('invoke_args', 'test_invoke_args.c', 'sandbox_invoke_args.c')
« no previous file with comments | « src/minsfi/untrusted/start.c ('k') | tests/minsfi/sandbox_invoke_args.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698