Merge pull request #375 from jmgao:master

PiperOrigin-RevId: 257041876

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

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