commit 232681160ae79f99a3698b0158eef837b7808a03
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 26 01:30:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 26 01:30:03 2017 +0000
tree 0e8fc47f3d7c9c15df6ff38185e8f75b9a396b04
parent eca29cb50808260b70965398cb9a8d120b00377c
parent f008a11ef2ed42d4eb66a55e5ce89748daf674da

Merge "Relax flaky _SC_AVPHYS_PAGES check in sys_sysinfo_test"

tests/sys_sysinfo_test.cpp

diff --git a/tests/sys_sysinfo_test.cpp b/tests/sys_sysinfo_test.cpp
index d7d0f6e..ea35b4e 100644
--- a/tests/sys_sysinfo_test.cpp
+++ b/tests/sys_sysinfo_test.cpp
@@ -28,13 +28,14 @@
   ASSERT_GE(nprocs_conf, nprocs);
   ASSERT_EQ(sysconf(_SC_NPROCESSORS_CONF), nprocs_conf);
 
-  long avail_phys_pages = get_avphys_pages();
-  ASSERT_GT(avail_phys_pages, 0);
-  ASSERT_EQ(sysconf(_SC_AVPHYS_PAGES), avail_phys_pages);
-
   long phys_pages = get_phys_pages();
+  long avail_phys_pages = get_avphys_pages();
+
   ASSERT_GE(phys_pages, avail_phys_pages);
   ASSERT_EQ(sysconf(_SC_PHYS_PAGES), phys_pages);
+
+  ASSERT_GT(avail_phys_pages, 0);
+  ASSERT_GE(phys_pages, sysconf(_SC_AVPHYS_PAGES));
 }
 
 TEST(sys_sysinfo, sysinfo) {