From d86a95a91cd86a7b9fe422585a75ecb413e7960f Mon Sep 17 00:00:00 2001 From: Sung-Eun Choi Date: Thu, 24 Dec 2015 10:57:26 -0600 Subject: [PATCH 1/2] 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 --- prov/gni/test/allocator.c | 2 +- prov/gni/test/pmi_utils.c | 4 ++-- prov/gni/test/run_gnitest | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prov/gni/test/allocator.c b/prov/gni/test/allocator.c index 462f45e95c3..007d10f5fa4 100644 --- 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 index 1dbf3de5976..dda646eebb0 100644 --- 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 index 397a13ceca0..e2f28217f2c 100755 --- 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 "$@" From ccf3d45cff90f9450e98a49b7327a07d31d3e927 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Tue, 29 Dec 2015 10:51:35 -0800 Subject: [PATCH 2/2] prov/gni:configury, add rpath for criterion Add an rpath for criterion now that its using shared libs. Signed-off-by: Howard Pritchard --- prov/gni/configure.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prov/gni/configure.m4 b/prov/gni/configure.m4 index 47e03c5fd0a..00cbc2d4c10 100644 --- a/prov/gni/configure.m4 +++ b/prov/gni/configure.m4 @@ -63,10 +63,10 @@ AC_DEFUN([FI_GNI_CONFIGURE],[ AC_MSG_RESULT([yes]) gni_CPPFLAGS="-I$with_criterion/include $gni_CPPFLAGS" if test -d "$with_criterion/lib"; then - gni_LDFLAGS="$CRAY_ALPS_LLI_STATIC_LIBS -L$with_criterion/lib $gni_LDFLAGS" + gni_LDFLAGS="$CRAY_ALPS_LLI_STATIC_LIBS -L$with_criterion/lib -Wl,-rpath=$with_criterion/lib $gni_LDFLAGS" have_criterion=true elif test -d "$with_criterion/lib64"; then - gni_LDFLAGS="$CRAY_ALPS_LLI_STATIC_LIBS -L$with_criterion/lib64 $gni_LDFLAGS" + gni_LDFLAGS="$CRAY_ALPS_LLI_STATIC_LIBS -L$with_criterion/lib64 -Wl,-rpath=$with_criterion/lib64 $gni_LDFLAGS" have_criterion=true else have_criterion=false