tests: don't abuse synthetic topology strings

Use what's officially supported, no deprecated or possibly ambiguous syntax.

diff --git a/tests/hwloc_custom.c b/tests/hwloc_custom.c
index 26655d269d1c88cc3ef9c2e48286988b27049bc5..157c2798d2110422d0e909ff9cc6db118f626504 100644 (file)
--- a/tests/hwloc_custom.c
+++ b/tests/hwloc_custom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2011 inria.  All rights reserved.
+ * Copyright © 2011-2014 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -18,7 +18,7 @@ int main(void)
 
   printf("Loading the local topology...\n");
   hwloc_topology_init(&local);
-  hwloc_topology_set_synthetic(local, "n:2 s:2 ca:1 core:2 ca:2 pu:2");
+  hwloc_topology_set_synthetic(local, "node:2 socket:2 cache:1 core:2 cache:2 pu:2");
   hwloc_topology_load(local);
 
   printf("Try to create an empty custom topology...\n");

diff --git a/tests/hwloc_get_obj_below_array_by_type.c b/tests/hwloc_get_obj_below_array_by_type.c
index 8b35f77bb09baa687d757aeb0aaae3554218ad40..af866242892e1233745b22557a0aa486b956fdf6 100644 (file)
--- a/tests/hwloc_get_obj_below_array_by_type.c
+++ b/tests/hwloc_get_obj_below_array_by_type.c
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2010 inria.  All rights reserved.
+ * Copyright © 2009-2014 Inria.  All rights reserved.
  * Copyright © 2009 Université Bordeaux 1
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -30,7 +30,7 @@ main (void)
   if (err)
     return EXIT_FAILURE;
 
-  hwloc_topology_set_synthetic (topology, "node:3 socket:3 core:3 proc:3");
+  hwloc_topology_set_synthetic (topology, "node:3 socket:3 core:3 pu:3");
 
   err = hwloc_topology_load (topology);
   if (err)