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.
Этот коммит содержится в:
родитель
70587299f3
Коммит
9dab81d86b
@ -14,7 +14,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
|
|
||||||
# support needs to be first for dependencies
|
# support needs to be first for dependencies
|
||||||
SUBDIRS = support asm class dps mca runtime threads util
|
SUBDIRS = support asm class dps mca runtime threads util
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
|
|
||||||
TESTS_ENVIRONMENT = $(SHELL) $(srcdir)/run_tests
|
TESTS_ENVIRONMENT = $(SHELL) $(srcdir)/run_tests
|
||||||
|
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
ompi_bitmap \
|
ompi_bitmap \
|
||||||
|
@ -14,8 +14,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
dps_test
|
dps_test
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
# $HEADER$
|
# $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
|
||||||
|
@ -15,15 +15,11 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support -g
|
|
||||||
|
|
||||||
TESTS_ENVIRONMENT = TEST_WRITE_TO_FILE=1
|
TESTS_ENVIRONMENT = TEST_WRITE_TO_FILE=1
|
||||||
|
|
||||||
# JMS Commented out so that the default "make check" will skip these
|
check_PROGRAMS = \
|
||||||
# (per rhc request)
|
|
||||||
#check_PROGRAMS = \
|
|
||||||
bogus = \
|
|
||||||
gpr_internal_fns \
|
gpr_internal_fns \
|
||||||
gpr_mem_leaks \
|
gpr_mem_leaks \
|
||||||
gpr_overwrite \
|
gpr_overwrite \
|
||||||
@ -33,40 +29,38 @@ bogus = \
|
|||||||
|
|
||||||
TESTS =
|
TESTS =
|
||||||
|
|
||||||
# JMS Commented out so that the default "make check" will skip these
|
gpr_internal_fns_SOURCES = gpr_internal_fns.c
|
||||||
# (per rhc request)
|
gpr_internal_fns_LDADD = \
|
||||||
#gpr_internal_fns_SOURCES = gpr_internal_fns.c
|
$(top_builddir)/src/libmpi.la \
|
||||||
#gpr_internal_fns_LDADD = \
|
$(top_builddir)/test/support/libsupport.a
|
||||||
# $(top_builddir)/src/libmpi.la \
|
gpr_internal_fns_DEPENDENCIES = $(gpr_internal_fns_LDADD)
|
||||||
# $(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_SOURCES = gpr_mem_leaks.c
|
||||||
#gpr_mem_leaks_LDADD = \
|
gpr_mem_leaks_LDADD = \
|
||||||
# $(top_builddir)/src/libmpi.la \
|
$(top_builddir)/src/libmpi.la \
|
||||||
# $(top_builddir)/test/support/libsupport.a
|
$(top_builddir)/test/support/libsupport.a
|
||||||
#gpr_mem_leaks_DEPENDENCIES = $(gpr_mem_leaks_LDADD)
|
gpr_mem_leaks_DEPENDENCIES = $(gpr_mem_leaks_LDADD)
|
||||||
|
|
||||||
#gpr_overwrite_SOURCES = gpr_overwrite.c
|
gpr_overwrite_SOURCES = gpr_overwrite.c
|
||||||
#gpr_overwrite_LDADD = \
|
gpr_overwrite_LDADD = \
|
||||||
# $(top_builddir)/src/libmpi.la \
|
$(top_builddir)/src/libmpi.la \
|
||||||
# $(top_builddir)/test/support/libsupport.a
|
$(top_builddir)/test/support/libsupport.a
|
||||||
#gpr_overwrite_DEPENDENCIES = $(gpr_overwrite_LDADD)
|
gpr_overwrite_DEPENDENCIES = $(gpr_overwrite_LDADD)
|
||||||
|
|
||||||
#gpr_put_get_SOURCES = gpr_put_get.c
|
gpr_put_get_SOURCES = gpr_put_get.c
|
||||||
#gpr_put_get_LDADD = \
|
gpr_put_get_LDADD = \
|
||||||
# $(top_builddir)/src/libmpi.la \
|
$(top_builddir)/src/libmpi.la \
|
||||||
# $(top_builddir)/test/support/libsupport.a
|
$(top_builddir)/test/support/libsupport.a
|
||||||
#gpr_put_get_DEPENDENCIES = $(gpr_put_get_LDADD)
|
gpr_put_get_DEPENDENCIES = $(gpr_put_get_LDADD)
|
||||||
|
|
||||||
#gpr_threads_SOURCES = gpr_threads.c
|
gpr_threads_SOURCES = gpr_threads.c
|
||||||
#gpr_threads_LDADD = \
|
gpr_threads_LDADD = \
|
||||||
# $(top_builddir)/src/libmpi.la \
|
$(top_builddir)/src/libmpi.la \
|
||||||
# $(top_builddir)/test/support/libsupport.a
|
$(top_builddir)/test/support/libsupport.a
|
||||||
#gpr_threads_DEPENDENCIES = $(gpr_threads_LDADD)
|
gpr_threads_DEPENDENCIES = $(gpr_threads_LDADD)
|
||||||
|
|
||||||
#gpr_triggers_SOURCES = gpr_triggers.c
|
gpr_triggers_SOURCES = gpr_triggers.c
|
||||||
#gpr_triggers_LDADD = \
|
gpr_triggers_LDADD = \
|
||||||
# $(top_builddir)/src/libmpi.la \
|
$(top_builddir)/src/libmpi.la \
|
||||||
# $(top_builddir)/test/support/libsupport.a
|
$(top_builddir)/test/support/libsupport.a
|
||||||
#gpr_triggers_DEPENDENCIES = $(gpr_triggers_LDADD)
|
gpr_triggers_DEPENDENCIES = $(gpr_triggers_LDADD)
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -g -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
oob_test \
|
oob_test \
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
test_ras
|
test_ras
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
test_rds
|
test_rds
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
test_rmaps
|
test_rmaps
|
||||||
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
test_schema
|
test_schema
|
||||||
|
@ -15,6 +15,6 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
|
|
||||||
SUBDIRS = environment
|
SUBDIRS = environment
|
||||||
|
@ -15,9 +15,8 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
AM_LDFLAGS = -lpthread
|
AM_LDFLAGS = -lpthread
|
||||||
|
|
||||||
noinst_PROGRAMS = chello
|
noinst_PROGRAMS = chello
|
||||||
|
@ -15,9 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = \
|
|
||||||
-I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
sigchld \
|
sigchld \
|
||||||
|
@ -14,11 +14,11 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
|
|
||||||
AM_CFLAGS = -g
|
EXTRA_DIST = run_tests
|
||||||
AM_CPPFLAGS = \
|
|
||||||
-I$(top_srcdir)/test/support \
|
AM_CPPFLAGS += \
|
||||||
-DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
|
-DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
|
||||||
-DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"
|
-DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"
|
||||||
|
|
||||||
|
21
test/support/Makefile.options
Обычный файл
21
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
|
@ -15,8 +15,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
AM_LDFLAGS = -lpthread
|
AM_LDFLAGS = -lpthread
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
|
@ -14,8 +14,7 @@
|
|||||||
# $HEADER$
|
# $HEADER$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(top_srcdir)/config/Makefile.options
|
include $(top_srcdir)/test/support/Makefile.options
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/test/support
|
|
||||||
|
|
||||||
check_PROGRAMS = \
|
check_PROGRAMS = \
|
||||||
ompi_numtostr \
|
ompi_numtostr \
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user