From 98943d3c8b420acfa8311d9419c42ef65bdd91eb Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sat, 2 May 2015 03:57:19 -0700 Subject: [PATCH] test/datatype: move ddt_pack to MPI_CHECKS This still leaves the test disabled (per b25a7bfe14ea516550c77d4ced84e8d828a6bf0f), but it does still build the test. --- test/datatype/Makefile.am | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/datatype/Makefile.am b/test/datatype/Makefile.am index 503d806320..ee07b5970b 100644 --- a/test/datatype/Makefile.am +++ b/test/datatype/Makefile.am @@ -15,7 +15,7 @@ if PROJECT_OMPI MPI_TESTS = checksum position position_noncontig ddt_test ddt_raw unpack_ooo - MPI_CHECKS = to_self + MPI_CHECKS = to_self ddt_pack endif TESTS = opal_datatype_test $(MPI_TESTS) @@ -33,13 +33,9 @@ ddt_raw_SOURCES = ddt_raw.c ddt_lib.c ddt_lib.h ddt_raw_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) ddt_raw_LDADD = $(top_builddir)/ompi/libmpi.la -# Temporarily removed, per -# https://github.com/open-mpi/ompi-release/pull/267. This test needs -# to be revised to not call MPI_Init (it needs to only call -# opal_init_util). -#ddt_pack_SOURCES = ddt_pack.c -#ddt_pack_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) -#ddt_pack_LDADD = $(top_builddir)/ompi/libmpi.la +ddt_pack_SOURCES = ddt_pack.c +ddt_pack_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) +ddt_pack_LDADD = $(top_builddir)/ompi/libmpi.la checksum_SOURCES = checksum.c checksum_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)