diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-07-08 13:41:00 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-07-08 13:51:09 -0700 |
| commit | c2cebbc8da6a1556e5fa6b304863928576bf3e15 (patch) | |
| tree | bb2dd358c459d6653ac64e981c97b635f4f61b3e | |
| parent | 659bebab8e83ec9b5f6fef26ca27048af526ee40 (diff) | |
| parent | b915a25597a961311ceb57f89d18eaee9c9461d8 (diff) | |
Merge pull request #375 from jmgao:master
PiperOrigin-RevId: 257041876
| -rw-r--r-- | runsc/boot/loader.go | 2 | ||||
| -rw-r--r-- | test/util/test_util.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 38e426ee7..8e8c6105b 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -262,7 +262,7 @@ func New(args Args) (*Loader, error) { // Adjust the total memory returned by the Sentry so that applications that // use /proc/meminfo can make allocations based on this limit. usage.MinimumTotalMemoryBytes = args.TotalMem - log.Infof("Setting total memory to %.2f GB", float64(args.TotalMem)/(2^30)) + log.Infof("Setting total memory to %.2f GB", float64(args.TotalMem)/(1<<30)) } // Initiate the Kernel object, which is required by the Context passed diff --git a/test/util/test_util.cc b/test/util/test_util.cc index e42bba04a..4fe15afaa 100644 --- a/test/util/test_util.cc +++ b/test/util/test_util.cc @@ -231,6 +231,7 @@ void TestInit(int* argc, char*** argv) { sa.sa_handler = SIG_IGN; TEST_CHECK(sigaction(SIGPIPE, &sa, nullptr) == 0); } + gvisor:case-end } // namespace testing } // namespace gvisor |