Merge branch 'master' into balder/save-errno-before-checking

2 files changed, 5 insertions, 17 deletions

diff --git a/vespamalloc/src/tests/stacktrace/stacktrace.cpp b/vespamalloc/src/tests/stacktrace/stacktrace.cpp
index 37322994586..f30e3c20f55 100644
--- a/vespamalloc/src/tests/stacktrace/stacktrace.cpp
+++ b/vespamalloc/src/tests/stacktrace/stacktrace.cpp
@@ -17,22 +17,12 @@ void * run(void * arg)
 }
 
 void verify_that_vespamalloc_datasegment_size_exists() {
-#if __GLIBC_PREREQ(2, 33)
-    struct mallinfo2 info = mallinfo2();
-    printf("Malloc used %zdm of memory\n", info.arena);
-    assert(info.arena >= 10 * 0x100000ul);
-    assert(info.arena < 10000 * 0x100000ul);
-    assert(info.fordblks == 0);
-    assert(info.fsmblks == 0);
-    assert(info.hblkhd == 0);
-    assert(info.hblks == 0);
-    assert(info.keepcost == 0);
-    assert(info.ordblks == 0);
-    assert(info.smblks == 0);
-    assert(info.uordblks == 0);
-    assert(info.usmblks == 0);
-#else
+#pragma GCC diagnostic push
+#if __GNUC_PREREQ(2, 33)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
     struct mallinfo info = mallinfo();
+#pragma GCC diagnostic push
     printf("Malloc used %dm of memory\n",info.arena);
     assert(info.arena >= 10);
     assert(info.arena < 10000);
@@ -45,7 +35,6 @@ void verify_that_vespamalloc_datasegment_size_exists() {
     assert(info.smblks == 0);
     assert(info.uordblks == 0);
     assert(info.usmblks == 0);
-#endif
 }
 
 int main(int argc, char *argv[])
diff --git a/vespamalloc/src/tests/test1/new_test.cpp b/vespamalloc/src/tests/test1/new_test.cpp
index 7988367f415..e73def175b0 100644
--- a/vespamalloc/src/tests/test1/new_test.cpp
+++ b/vespamalloc/src/tests/test1/new_test.cpp
@@ -111,7 +111,6 @@ TEST("verify realloarray") {
     EXPECT_EQUAL(nullptr, arr3);
     EXPECT_EQUAL(ENOMEM, myErrno);
 }
-#endif
 
 void verify_vespamalloc_usable_size() {
     struct AllocInfo { size_t requested; size_t usable;};