A bunch of updates to the unit tests

- Update svn:ignore's to match new exectuable names - Consolidate the unit test Makefile.am flags into a testing Makefile.options - Remove a bunch of SUBDIRS from test/mca/Makefile so that they don't run by default, but can be invoked manually (they're still in DIST_SUBDIRS) This commit was SVN r6598.
2005-07-23 11:11:19 +00:00 · 2005-07-23 11:11:19 +00:00 · 9dab81d86b
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -14,7 +14,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
+include $(top_srcdir)/test/support/Makefile.options

 # support needs to be first for dependencies
 SUBDIRS = support asm class dps mca runtime threads util
--- a/test/asm/Makefile.am
+++ b/test/asm/Makefile.am
@ -14,7 +14,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
+include $(top_srcdir)/test/support/Makefile.options

 TESTS_ENVIRONMENT = $(SHELL) $(srcdir)/run_tests

--- a/test/class/Makefile.am
+++ b/test/class/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	ompi_bitmap \
--- a/test/dps/Makefile.am
+++ b/test/dps/Makefile.am
@ -14,8 +14,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	dps_test 
--- a/test/mca/Makefile.am
+++ b/test/mca/Makefile.am
@ -14,6 +14,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
+include $(top_srcdir)/test/support/Makefile.options

-SUBDIRS		= gpr ns oob ras rds rmaps schema
+SUBDIRS = oob schema
+DIST_SUBDIRS = gpr ns oob ras rds rmaps schema
--- a/test/mca/gpr/Makefile.am
+++ b/test/mca/gpr/Makefile.am
@ -15,15 +15,11 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support -g
+include $(top_srcdir)/test/support/Makefile.options

 TESTS_ENVIRONMENT = TEST_WRITE_TO_FILE=1

-# JMS Commented out so that the default "make check" will skip these
-# (per rhc request)
-#check_PROGRAMS = \
-bogus = \
+check_PROGRAMS = \
    gpr_internal_fns \
    gpr_mem_leaks \
    gpr_overwrite \
@ -33,40 +29,38 @@ bogus = \

 TESTS = 

-# 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_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)
--- a/test/mca/oob/Makefile.am
+++ b/test/mca/oob/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -g -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
    oob_test \
--- a/test/mca/ras/Makefile.am
+++ b/test/mca/ras/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	test_ras
--- a/test/mca/rds/Makefile.am
+++ b/test/mca/rds/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	test_rds
--- a/test/mca/rmaps/Makefile.am
+++ b/test/mca/rmaps/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	test_rmaps
--- a/test/mca/schema/Makefile.am
+++ b/test/mca/schema/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	test_schema
--- a/test/mpi/Makefile.am
+++ b/test/mpi/Makefile.am
@ -15,6 +15,6 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
+include $(top_srcdir)/test/support/Makefile.options

-SUBDIRS		= environment
+SUBDIRS = environment
--- a/test/mpi/environment/Makefile.am
+++ b/test/mpi/environment/Makefile.am
@ -15,9 +15,8 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
+include $(top_srcdir)/test/support/Makefile.options

-AM_CPPFLAGS = -I$(top_srcdir)/test/support
 AM_LDFLAGS = -lpthread

 noinst_PROGRAMS = chello
--- a/test/runtime/Makefile.am
+++ b/test/runtime/Makefile.am
@ -15,12 +15,10 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = \
-            -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
-	sigchld \
+    sigchld \
    start_shut

 TESTS = \
--- a/test/support/Makefile.am
+++ b/test/support/Makefile.am
@ -14,11 +14,11 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
+include $(top_srcdir)/test/support/Makefile.options

-AM_CFLAGS = -g
-AM_CPPFLAGS = \
-        -I$(top_srcdir)/test/support \
+EXTRA_DIST = run_tests
+
+AM_CPPFLAGS += \
        -DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
        -DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"

--- a/test/support/Makefile.options
+++ b/test/support/Makefile.options
@ -0,0 +1,21 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+AM_CFLAGS = -g
+AM_CPPFLAGS = -I$(top_srcdir)/test/support
--- a/test/threads/Makefile.am
+++ b/test/threads/Makefile.am
@ -15,8 +15,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options
 AM_LDFLAGS = -lpthread

 check_PROGRAMS = \
--- a/test/util/Makefile.am
+++ b/test/util/Makefile.am
@ -14,8 +14,7 @@
 # $HEADER$
 #

-include $(top_srcdir)/config/Makefile.options
-AM_CPPFLAGS = -I$(top_srcdir)/test/support
+include $(top_srcdir)/test/support/Makefile.options

 check_PROGRAMS = \
 	ompi_numtostr \