From 76ba66734dfa77b9be3d6a8153e8b118ae9b4c0d Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Sat, 25 Jun 2005 11:21:59 +0000
Subject: [PATCH] I gave bad advice to Ralph yesterday; he asked how to disable
the gpr unit tests without screwing up the nightly builds.
These changes fix the problem of not including the test/mca/gpr
directory in the nightly tarball, prevent the tests from being
compiled, but leave the door open for manual compilation when the time
comes to start the work to re-enable them (e.g., uncomment a few
lines in gpr/Makefile.am).
This commit was SVN r6175.
---
test/mca/Makefile.am | 2 +-
test/mca/gpr/Makefile.am | 67 +++++++++++++++++++++-------------------
2 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/test/mca/Makefile.am b/test/mca/Makefile.am
index 314d0c9edd..cc3ebb0a18 100644
--- a/test/mca/Makefile.am
+++ b/test/mca/Makefile.am
@@ -16,4 +16,4 @@
include $(top_srcdir)/config/Makefile.options
-SUBDIRS = ns oob ras rds rmaps schema
+SUBDIRS = gpr ns oob ras rds rmaps schema
diff --git a/test/mca/gpr/Makefile.am b/test/mca/gpr/Makefile.am
index a2c4077559..a8cdaecd6f 100644
--- a/test/mca/gpr/Makefile.am
+++ b/test/mca/gpr/Makefile.am
@@ -20,7 +20,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/test/support -g
TESTS_ENVIRONMENT = TEST_WRITE_TO_FILE=1
-check_PROGRAMS = \
+# JMS Commented out so that the default "make check" will skip these
+# (per rhc request)
+#check_PROGRAMS = \
+bogus = \
gpr_internal_fns \
gpr_mem_leaks \
gpr_overwrite \
@@ -30,38 +33,40 @@ check_PROGRAMS = \
TESTS =
-gpr_internal_fns_SOURCES = gpr_internal_fns.c
-gpr_internal_fns_LDADD = \
- $(top_builddir)/src/libmpi.la \
- $(top_builddir)/test/support/libsupport.a
-gpr_internal_fns_DEPENDENCIES = $(gpr_internal_fns_LDADD)
+# JMS Commented out so that the default "make check" will skip these
+# (per rhc request)
+#gpr_internal_fns_SOURCES = gpr_internal_fns.c
+#gpr_internal_fns_LDADD = \
+# $(top_builddir)/src/libmpi.la \
+# $(top_builddir)/test/support/libsupport.a
+#gpr_internal_fns_DEPENDENCIES = $(gpr_internal_fns_LDADD)
-gpr_mem_leaks_SOURCES = gpr_mem_leaks.c
-gpr_mem_leaks_LDADD = \
- $(top_builddir)/src/libmpi.la \
- $(top_builddir)/test/support/libsupport.a
-gpr_mem_leaks_DEPENDENCIES = $(gpr_mem_leaks_LDADD)
+#gpr_mem_leaks_SOURCES = gpr_mem_leaks.c
+#gpr_mem_leaks_LDADD = \
+# $(top_builddir)/src/libmpi.la \
+# $(top_builddir)/test/support/libsupport.a
+#gpr_mem_leaks_DEPENDENCIES = $(gpr_mem_leaks_LDADD)
-gpr_overwrite_SOURCES = gpr_overwrite.c
-gpr_overwrite_LDADD = \
- $(top_builddir)/src/libmpi.la \
- $(top_builddir)/test/support/libsupport.a
-gpr_overwrite_DEPENDENCIES = $(gpr_overwrite_LDADD)
+#gpr_overwrite_SOURCES = gpr_overwrite.c
+#gpr_overwrite_LDADD = \
+# $(top_builddir)/src/libmpi.la \
+# $(top_builddir)/test/support/libsupport.a
+#gpr_overwrite_DEPENDENCIES = $(gpr_overwrite_LDADD)
-gpr_put_get_SOURCES = gpr_put_get.c
-gpr_put_get_LDADD = \
- $(top_builddir)/src/libmpi.la \
- $(top_builddir)/test/support/libsupport.a
-gpr_put_get_DEPENDENCIES = $(gpr_put_get_LDADD)
+#gpr_put_get_SOURCES = gpr_put_get.c
+#gpr_put_get_LDADD = \
+# $(top_builddir)/src/libmpi.la \
+# $(top_builddir)/test/support/libsupport.a
+#gpr_put_get_DEPENDENCIES = $(gpr_put_get_LDADD)
-gpr_threads_SOURCES = gpr_threads.c
-gpr_threads_LDADD = \
- $(top_builddir)/src/libmpi.la \
- $(top_builddir)/test/support/libsupport.a
-gpr_threads_DEPENDENCIES = $(gpr_threads_LDADD)
+#gpr_threads_SOURCES = gpr_threads.c
+#gpr_threads_LDADD = \
+# $(top_builddir)/src/libmpi.la \
+# $(top_builddir)/test/support/libsupport.a
+#gpr_threads_DEPENDENCIES = $(gpr_threads_LDADD)
-gpr_triggers_SOURCES = gpr_triggers.c
-gpr_triggers_LDADD = \
- $(top_builddir)/src/libmpi.la \
- $(top_builddir)/test/support/libsupport.a
-gpr_triggers_DEPENDENCIES = $(gpr_triggers_LDADD)
+#gpr_triggers_SOURCES = gpr_triggers.c
+#gpr_triggers_LDADD = \
+# $(top_builddir)/src/libmpi.la \
+# $(top_builddir)/test/support/libsupport.a
+#gpr_triggers_DEPENDENCIES = $(gpr_triggers_LDADD)