Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest criterion version 2.2.0 #590

Merged
merged 3 commits into from
Jan 5, 2016
Merged

Update to latest criterion version 2.2.0 #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d86a95a
Updates for Criterion v2.2.0
sungeunchoi Dec 24, 2015
ccf3d45
prov/gni:configury, add rpath for criterion
hppritcha Dec 29, 2015
da50393
Merge pull request #1 from hppritcha/topic/add_rlink_to_new_criterion
sungeunchoi Jan 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions prov/gni/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion prov/gni/test/allocator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions prov/gni/test/pmi_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

static int pmi_initialized;

ReportHook(PRE_ALL)()
ReportHook(PRE_ALL)(struct criterion_test_set *test)
{
int rc, spawned;

Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion prov/gni/test/run_gnitest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ else
fi

# pass all command line args to gnitest
$launcher $args $gnitest_bin "$@"
$launcher $args $gnitest_bin -j1 "$@"