summary refs log tree commit diff
path: root/sys_util
diff options
context:
space:
mode:
authorMatt Delco <delco@chromium.org>2019-10-23 09:56:09 -0700
committerCommit Bot <commit-bot@chromium.org>2020-02-26 06:45:16 +0000
commitec8aacb1343108c399e423f430864ee84cff8515 (patch)
treebde849179de016b09303322122911dc4f90c3489 /sys_util
parent72ccaefe0f384f708b3d2fd71aa3f3b40ab4e3df (diff)
downloadcrosvm-ec8aacb1343108c399e423f430864ee84cff8515.tar
crosvm-ec8aacb1343108c399e423f430864ee84cff8515.tar.gz
crosvm-ec8aacb1343108c399e423f430864ee84cff8515.tar.bz2
crosvm-ec8aacb1343108c399e423f430864ee84cff8515.tar.lz
crosvm-ec8aacb1343108c399e423f430864ee84cff8515.tar.xz
crosvm-ec8aacb1343108c399e423f430864ee84cff8515.tar.zst
crosvm-ec8aacb1343108c399e423f430864ee84cff8515.zip
sys_util: cleanup shared mem file after test
Running "build_test" fails if it's been previously run using sudo.
The failure is:
thread 'main' panicked at 'error creating shared memory;'
and errno is 17, so apparently the shared memory name is left
behind.

BUG=None
TEST=Verified that "sudo build_teat" followed by "build_test" results in
a failure, while with this change it reports success.

Change-Id: I09748b9c0b89ac953e054de852277d819ad85287
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1876662
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Matt Delco <delco@chromium.org>
Diffstat (limited to 'sys_util')
-rw-r--r--sys_util/src/syslog.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys_util/src/syslog.rs b/sys_util/src/syslog.rs
index 82b7137..232f046 100644
--- a/sys_util/src/syslog.rs
+++ b/sys_util/src/syslog.rs
@@ -610,6 +610,7 @@ mod tests {
             shm_unlink(shm_name.as_ptr());
             let fd = shm_open(shm_name.as_ptr(), O_RDWR | O_CREAT | O_EXCL, 0666);
             assert!(fd >= 0, "error creating shared memory;");
+            shm_unlink(shm_name.as_ptr());
             File::from_raw_fd(fd)
         };