From 9dab81d86bdbf8974d62bce1dfb584d0f9fc0ee2 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sat, 23 Jul 2005 11:11:19 +0000 Subject: [PATCH] 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. --- test/Makefile.am | 2 +- test/asm/Makefile.am | 2 +- test/class/Makefile.am | 3 +- test/dps/Makefile.am | 3 +- test/mca/Makefile.am | 5 ++- test/mca/gpr/Makefile.am | 70 +++++++++++++++----------------- test/mca/oob/Makefile.am | 3 +- test/mca/ras/Makefile.am | 3 +- test/mca/rds/Makefile.am | 3 +- test/mca/rmaps/Makefile.am | 3 +- test/mca/schema/Makefile.am | 3 +- test/mpi/Makefile.am | 4 +- test/mpi/environment/Makefile.am | 3 +- test/runtime/Makefile.am | 6 +-- test/support/Makefile.am | 8 ++-- test/support/Makefile.options | 21 ++++++++++ test/threads/Makefile.am | 3 +- test/util/Makefile.am | 3 +- 18 files changed, 76 insertions(+), 72 deletions(-) create mode 100644 test/support/Makefile.options diff --git a/test/Makefile.am b/test/Makefile.am index 9386dc75c6..338abeba41 100644 --- 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 diff --git a/test/asm/Makefile.am b/test/asm/Makefile.am index cffa447255..f1705dd8e2 100644 --- 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 diff --git a/test/class/Makefile.am b/test/class/Makefile.am index 789db5646f..2387a54329 100644 --- 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 \ diff --git a/test/dps/Makefile.am b/test/dps/Makefile.am index 5ff93e9255..b665e23ef8 100644 --- 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 diff --git a/test/mca/Makefile.am b/test/mca/Makefile.am index cc3ebb0a18..e2fef6adc5 100644 --- 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 diff --git a/test/mca/gpr/Makefile.am b/test/mca/gpr/Makefile.am index a8cdaecd6f..eff389e805 100644 --- 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) diff --git a/test/mca/oob/Makefile.am b/test/mca/oob/Makefile.am index 5907d4cbe4..84c5b67668 100644 --- 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 \ diff --git a/test/mca/ras/Makefile.am b/test/mca/ras/Makefile.am index a52f5da213..aa9f28d0a2 100644 --- 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 diff --git a/test/mca/rds/Makefile.am b/test/mca/rds/Makefile.am index a0a469e5d4..64c95c51cd 100644 --- 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 diff --git a/test/mca/rmaps/Makefile.am b/test/mca/rmaps/Makefile.am index bae9d9d8f8..336ff7cbc5 100644 --- 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 diff --git a/test/mca/schema/Makefile.am b/test/mca/schema/Makefile.am index be6395e888..7cfd64bb2e 100644 --- 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 diff --git a/test/mpi/Makefile.am b/test/mpi/Makefile.am index fc32696ad9..60d77ef611 100644 --- 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 diff --git a/test/mpi/environment/Makefile.am b/test/mpi/environment/Makefile.am index 59c11e404f..c129b0bc52 100644 --- 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 diff --git a/test/runtime/Makefile.am b/test/runtime/Makefile.am index efdeaeabc4..49763c343a 100644 --- 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 = \ diff --git a/test/support/Makefile.am b/test/support/Makefile.am index d0abb68328..2d765b42b1 100644 --- 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)\" diff --git a/test/support/Makefile.options b/test/support/Makefile.options new file mode 100644 index 0000000000..9d4b44b86f --- /dev/null +++ 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 diff --git a/test/threads/Makefile.am b/test/threads/Makefile.am index 5f35c8a837..b0fa150bc9 100644 --- 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 = \ diff --git a/test/util/Makefile.am b/test/util/Makefile.am index 6986bd8a24..c1fd4d5bb2 100644 --- 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 \