diff options
| author | Dylan Reid <dgreid@google.com> | 2020-06-11 19:16:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 19:16:28 +0000 |
| commit | cea58f3d84438dbd4e10a0e1e321b432bc45ac67 (patch) | |
| tree | 26262e9765b5fb1e3b1de9f73b191fc9614a9853 | |
| parent | 2b6c3ef891624f25c528dd18205b162edf1e2e0c (diff) | |
| parent | 58f1e5a10e1479bf8c5a49b232b1c4a4ba1cd5d6 (diff) | |
| download | platform_external_minijail-cea58f3d84438dbd4e10a0e1e321b432bc45ac67.tar.gz platform_external_minijail-cea58f3d84438dbd4e10a0e1e321b432bc45ac67.tar.bz2 platform_external_minijail-cea58f3d84438dbd4e10a0e1e321b432bc45ac67.zip | |
Set library path in unittest am: 83276a060d am: 58f1e5a10e
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1329370
Change-Id: I5d0198b0c15669d42b1348a73fba0f6c39854f27
| -rw-r--r-- | libminijail_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libminijail_unittest.cc b/libminijail_unittest.cc index 64b1a560..c6cc0c84 100644 --- a/libminijail_unittest.cc +++ b/libminijail_unittest.cc @@ -571,6 +571,9 @@ TEST(Test, minijail_run_env_pid_pipes_no_preload) { // Set a canary env var in the parent that should not be present in the child. ASSERT_EQ(setenv("TEST_PARENT", "test", 1 /*overwrite*/), 0); + // Use the preload library from this test build. + ASSERT_EQ(0, minijail_set_preload_path(j.get(), "./libminijailpreload.so")); + int child_stderr; mj_run_ret = minijail_run_env_pid_pipes(j.get(), argv[0], argv, envp, &pid, |