Merge branch 'coll_test_skip_if_not_supported' into devel

pmem · Dec 28, 2022 · 2f751d6 · 2f751d6
2 parents b81296c + 129bc8a
commit 2f751d6
Show file tree

Hide file tree

Showing 2 changed files with 129 additions and 119 deletions.
diff --git a/fabtests/multinode/include/coll_test.h b/fabtests/multinode/include/coll_test.h
@@ -31,15 +31,13 @@
  */
 #pragma once
 
-
-
-typedef int (*coll_test_setup_t)();
-typedef int (*coll_test_run_t)();
-typedef void (*coll_test_teardown_t)();
-
 struct coll_test {
-        char *name;
-        coll_test_setup_t setup;
-        coll_test_run_t run;
-        coll_test_teardown_t teardown;
-};
+	char *name;
+	int (*setup)(void);
+	int (*run)(enum fi_collective_op coll_op, enum fi_op op,
+		enum fi_datatype datatype);
+	int (*teardown)(void);
+	enum fi_collective_op coll_op;
+	enum fi_op op;
+	enum fi_datatype datatype;
+};