Updates for Criterion v2.2.0

- Interface updates (allocator.c, pmi_utils.c) - Use parallelism -j1 (run only 1 test at a time) Signed-off-by: Sung-Eun Choi <[email protected]>
ofi-cray · Dec 24, 2015 · d86a95a · d86a95a
1 parent 2d92b08
commit d86a95a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/prov/gni/test/allocator.c b/prov/gni/test/allocator.c
@@ -238,7 +238,7 @@ Test(mbox_creation, alloc_mbox)
 	 * Write our test strings and make sure they're equal.
 	 */
 	memcpy(mail_box->base, test_string, sizeof(test_string));
-	cr_expect_strings_eq((char *) mail_box->base, test_string);
+	cr_expect_str_eq((char *) mail_box->base, test_string);
 
 	/*
 	 * Mailboxes haven't been returned so destroy will return -FI_EBUSY.

diff --git a/prov/gni/test/pmi_utils.c b/prov/gni/test/pmi_utils.c
@@ -38,7 +38,7 @@
 
 static int pmi_initialized;
 
-ReportHook(PRE_ALL)()
+ReportHook(PRE_ALL)(struct criterion_test_set *test)
 {
 	int rc, spawned;
 
@@ -50,7 +50,7 @@ ReportHook(PRE_ALL)()
 		pmi_initialized = 1;
 }
 
-ReportHook(POST_ALL)()
+ReportHook(POST_ALL)(struct criterion_global_stats *stats)
 {
 	if (pmi_initialized == 1)
 		PMI_Finalize();

diff --git a/prov/gni/test/run_gnitest b/prov/gni/test/run_gnitest
@@ -60,4 +60,4 @@ else
 fi
 
 # pass all command line args to gnitest
-$launcher $args $gnitest_bin "$@"
+$launcher $args $gnitest_bin -j1 "$@"