720be6
From 666ed459887782994fa963f77f3144eb647e2b1e Mon Sep 17 00:00:00 2001
720be6
From: Michal Schmidt <mschmidt@redhat.com>
720be6
Date: Fri, 3 Nov 2017 10:34:07 +0100
720be6
Subject: [PATCH] tests: disable opal_fifo test
720be6
720be6
The opal_fifo test hangs on ppc64le.
720be6
https://github.com/open-mpi/ompi/issues/2526
720be6
https://github.com/open-mpi/ompi/issues/2966
720be6
---
720be6
 test/class/Makefile.am | 16 +++++++++-------
720be6
 test/class/Makefile.in | 26 +++-----------------------
720be6
 2 files changed, 12 insertions(+), 30 deletions(-)
720be6
720be6
diff --git a/test/class/Makefile.am b/test/class/Makefile.am
720be6
index 4dc7daf24c..fc325ef96e 100644
720be6
--- a/test/class/Makefile.am
720be6
+++ b/test/class/Makefile.am
720be6
@@ -35,8 +35,7 @@ check_PROGRAMS = \
720be6
 	opal_list \
720be6
 	opal_value_array \
720be6
 	opal_pointer_array \
720be6
-	opal_lifo \
720be6
-	opal_fifo
720be6
+	opal_lifo
720be6
 
720be6
 TESTS = $(check_PROGRAMS)
720be6
 
720be6
@@ -95,11 +94,14 @@ opal_lifo_LDADD = \
720be6
 	$(top_builddir)/test/support/libsupport.a
720be6
 opal_lifo_DEPENDENCIES = $(opal_lifo_LDADD)
720be6
 
720be6
-opal_fifo_SOURCES = opal_fifo.c
720be6
-opal_fifo_LDADD = \
720be6
-        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
720be6
-	$(top_builddir)/test/support/libsupport.a
720be6
-opal_fifo_DEPENDENCIES = $(opal_fifo_LDADD)
720be6
+# Disabled due to:
720be6
+# https://github.com/open-mpi/ompi/issues/2526
720be6
+# https://github.com/open-mpi/ompi/issues/2966
720be6
+#opal_fifo_SOURCES = opal_fifo.c
720be6
+#opal_fifo_LDADD = \
720be6
+#        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
720be6
+#	$(top_builddir)/test/support/libsupport.a
720be6
+#opal_fifo_DEPENDENCIES = $(opal_fifo_LDADD)
720be6
 
720be6
 clean-local:
720be6
 	rm -f opal_bitmap_test_out.txt opal_hash_table_test_out.txt opal_proc_table_test_out.txt
720be6
diff --git a/test/class/Makefile.in b/test/class/Makefile.in
720be6
index c6c20f30b9..2ed128a77f 100644
720be6
--- a/test/class/Makefile.in
720be6
+++ b/test/class/Makefile.in
720be6
@@ -115,7 +115,7 @@ check_PROGRAMS = $(am__EXEEXT_1) opal_bitmap$(EXEEXT) \
720be6
 	opal_hash_table$(EXEEXT) opal_proc_table$(EXEEXT) \
720be6
 	opal_tree$(EXEEXT) opal_list$(EXEEXT) \
720be6
 	opal_value_array$(EXEEXT) opal_pointer_array$(EXEEXT) \
720be6
-	opal_lifo$(EXEEXT) opal_fifo$(EXEEXT)
720be6
+	opal_lifo$(EXEEXT)
720be6
 subdir = test/class
720be6
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
720be6
 am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \
720be6
@@ -426,8 +426,6 @@ am__v_lt_0 = --silent
720be6
 am__v_lt_1 = 
720be6
 am_opal_bitmap_OBJECTS = opal_bitmap.$(OBJEXT)
720be6
 opal_bitmap_OBJECTS = $(am_opal_bitmap_OBJECTS)
720be6
-am_opal_fifo_OBJECTS = opal_fifo.$(OBJEXT)
720be6
-opal_fifo_OBJECTS = $(am_opal_fifo_OBJECTS)
720be6
 am_opal_hash_table_OBJECTS = opal_hash_table.$(OBJEXT)
720be6
 opal_hash_table_OBJECTS = $(am_opal_hash_table_OBJECTS)
720be6
 am_opal_lifo_OBJECTS = opal_lifo.$(OBJEXT)
720be6
@@ -477,12 +475,12 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
720be6
 am__v_CCLD_0 = @echo "  CCLD    " $@;
720be6
 am__v_CCLD_1 = 
720be6
 SOURCES = $(ompi_rb_tree_SOURCES) $(opal_bitmap_SOURCES) \
720be6
-	$(opal_fifo_SOURCES) $(opal_hash_table_SOURCES) \
720be6
+	$(opal_hash_table_SOURCES) \
720be6
 	$(opal_lifo_SOURCES) $(opal_list_SOURCES) \
720be6
 	$(opal_pointer_array_SOURCES) $(opal_proc_table_SOURCES) \
720be6
 	$(opal_tree_SOURCES) $(opal_value_array_SOURCES)
720be6
 DIST_SOURCES = $(ompi_rb_tree_SOURCES) $(opal_bitmap_SOURCES) \
720be6
-	$(opal_fifo_SOURCES) $(opal_hash_table_SOURCES) \
720be6
+	$(opal_hash_table_SOURCES) \
720be6
 	$(opal_lifo_SOURCES) $(opal_list_SOURCES) \
720be6
 	$(opal_pointer_array_SOURCES) $(opal_proc_table_SOURCES) \
720be6
 	$(opal_tree_SOURCES) $(opal_value_array_SOURCES)
720be6
@@ -1974,12 +1972,6 @@ opal_lifo_LDADD = \
720be6
 	$(top_builddir)/test/support/libsupport.a
720be6
 
720be6
 opal_lifo_DEPENDENCIES = $(opal_lifo_LDADD)
720be6
-opal_fifo_SOURCES = opal_fifo.c
720be6
-opal_fifo_LDADD = \
720be6
-        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
720be6
-	$(top_builddir)/test/support/libsupport.a
720be6
-
720be6
-opal_fifo_DEPENDENCIES = $(opal_fifo_LDADD)
720be6
 all: all-am
720be6
 
720be6
 .SUFFIXES:
720be6
@@ -2031,10 +2023,6 @@ opal_bitmap$(EXEEXT): $(opal_bitmap_OBJECTS) $(opal_bitmap_DEPENDENCIES) $(EXTRA
720be6
 	@rm -f opal_bitmap$(EXEEXT)
720be6
 	$(AM_V_CCLD)$(LINK) $(opal_bitmap_OBJECTS) $(opal_bitmap_LDADD) $(LIBS)
720be6
 
720be6
-opal_fifo$(EXEEXT): $(opal_fifo_OBJECTS) $(opal_fifo_DEPENDENCIES) $(EXTRA_opal_fifo_DEPENDENCIES) 
720be6
-	@rm -f opal_fifo$(EXEEXT)
720be6
-	$(AM_V_CCLD)$(LINK) $(opal_fifo_OBJECTS) $(opal_fifo_LDADD) $(LIBS)
720be6
-
720be6
 opal_hash_table$(EXEEXT): $(opal_hash_table_OBJECTS) $(opal_hash_table_DEPENDENCIES) $(EXTRA_opal_hash_table_DEPENDENCIES) 
720be6
 	@rm -f opal_hash_table$(EXEEXT)
720be6
 	$(AM_V_CCLD)$(LINK) $(opal_hash_table_OBJECTS) $(opal_hash_table_LDADD) $(LIBS)
720be6
@@ -2071,7 +2059,6 @@ distclean-compile:
720be6
 
720be6
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ompi_rb_tree.Po@am__quote@
720be6
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opal_bitmap.Po@am__quote@
720be6
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opal_fifo.Po@am__quote@
720be6
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opal_hash_table.Po@am__quote@
720be6
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opal_lifo.Po@am__quote@
720be6
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opal_list.Po@am__quote@
720be6
@@ -2366,13 +2353,6 @@ opal_lifo.log: opal_lifo$(EXEEXT)
720be6
 	--log-file $$b.log --trs-file $$b.trs \
720be6
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
720be6
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
720be6
-opal_fifo.log: opal_fifo$(EXEEXT)
720be6
-	@p='opal_fifo$(EXEEXT)'; \
720be6
-	b='opal_fifo'; \
720be6
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
720be6
-	--log-file $$b.log --trs-file $$b.trs \
720be6
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
720be6
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
720be6
 .test.log:
720be6
 	@p='$<'; \
720be6
 	$(am__set_b); \
720be6
-- 
720be6
2.13.6
720be6