X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78a473edeca3dbc88eccbd5d882ac0494dce2360..37f59772746532da25dbcbfae445039828dfd178:/teshsuite/mc/dwarf/dwarf.cpp

diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp
index b3fe240bcc..352a73b00d 100644
--- a/teshsuite/mc/dwarf/dwarf.cpp
+++ b/teshsuite/mc/dwarf/dwarf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,6 +8,7 @@
 #endif
 
 #include <mc/mc.h>
+#include <simgrid/s4u/Engine.hpp>
 
 #include "mc/datatypes.h"
 #include "src/mc/mc_private.hpp"
@@ -20,9 +21,14 @@
 #include <cassert>
 #include <cstring>
 
-// Test broken with multi-dimensional arrays. See https://sourceware.org/bugzilla/show_bug.cgi?id=22546
-// int test_some_array[4][5][6];
+#include <elfutils/version.h>
+#if _ELFUTILS_VERSION < 171
+// Elder elfutils/libdw broken with multi-dimensional arrays. See https://sourceware.org/bugzilla/show_bug.cgi?id=22546
 int test_some_array[4 * 5 * 6];
+#else
+int test_some_array[4][5][6];
+#endif
+
 struct some_struct {
   int first;
   int second[4][5];
@@ -32,9 +38,9 @@ some_struct test_some_struct;
 static simgrid::mc::Frame* find_function_by_name(
     simgrid::mc::ObjectInformation* info, const char* name)
 {
-  for (auto& entry : info->subprograms)
-    if(entry.second.name == name)
-      return &entry.second;
+  for (auto& [_, entry] : info->subprograms)
+    if (entry.name == name)
+      return &entry;
   return nullptr;
 }
 
@@ -111,13 +117,13 @@ static void test_type_by_name(const simgrid::mc::RemoteProcess& process, s_foo /
 
 int main(int argc, char** argv)
 {
-  SIMIX_global_init(&argc, argv);
+  simgrid::s4u::Engine::get_instance(&argc, argv);
 
   const simgrid::mc::Variable* var;
   simgrid::mc::Type* type;
 
   simgrid::mc::RemoteProcess process(getpid());
-  process.init(nullptr, nullptr, nullptr, nullptr);
+  process.init(nullptr, nullptr);
 
   test_global_variable(process, process.binary_info.get(), "some_local_variable", &some_local_variable, sizeof(int));