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

Unified Diff: tests/pnacl_dynamic_loading/nacl.scons

Issue 1832623002: PNaCl Dynamic Linking: Using unordered_set to disallow duplicate modules. (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Added AddBySoname/SetSonameSearchPaths, tested in pll_loader_test Created 4 years, 9 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: tests/pnacl_dynamic_loading/nacl.scons
diff --git a/tests/pnacl_dynamic_loading/nacl.scons b/tests/pnacl_dynamic_loading/nacl.scons
index e9826fefc06a3b32c929922b54cfa3c6a16ceedc..c6284b735e4ab5efece1089e7653e7178be293b7 100644
--- a/tests/pnacl_dynamic_loading/nacl.scons
+++ b/tests/pnacl_dynamic_loading/nacl.scons
@@ -112,9 +112,14 @@ pll_loader_test = env.ComponentProgram(
node = env.CommandSelLdrTestNacl(
'pll_loader_test.out', pll_loader_test,
- [test_pll_a, test_pll_b, test_pll_tls],
+ [Dir('.').abspath, 'test_pll_a.so', 'test_pll_b.so', 'test_pll_tls.so'],
# Add '-a' to enable filesystem access for opening DSOs.
sel_ldr_flags=['-a'])
+# Since we are passing sonames (rather than scons objects) to the
+# pll_loader_test, these dependencies must be made explicit.
+Depends(node, test_pll_a)
Mark Seaborn 2016/03/26 00:30:11 An alternative is: CommandSelLdrTestNacl(..., ext
Sean Klein 2016/03/26 00:47:25 Done.
+Depends(node, test_pll_b)
+Depends(node, test_pll_tls)
env.AddNodeToTestSuite(
node, ['small_tests', 'toolchain_tests'],
'run_pll_loader_test', is_broken=is_broken)

Powered by Google App Engine
This is Rietveld 408576698