Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3382 build: clean unused link dependencies
[fs/lustre-release.git]
/
lustre
/
liblustre
/
tests
/
Makefile.am
diff --git
a/lustre/liblustre/tests/Makefile.am
b/lustre/liblustre/tests/Makefile.am
index
bbc30e8
..
c6c7e27
100644
(file)
--- a/
lustre/liblustre/tests/Makefile.am
+++ b/
lustre/liblustre/tests/Makefile.am
@@
-4,21
+4,19
@@
AM_CPPFLAGS = -I$(SYSIO)/include -I/opt/lam/include $(LLCPPFLAGS) -I$(top_srcdir
AM_CFLAGS = $(LLCFLAGS)
AM_LIBS = $(LIBEFENCE) $(LIBREADLINE)
AM_CFLAGS = $(LLCFLAGS)
AM_LIBS = $(LIBEFENCE) $(LIBREADLINE)
-LLIB_EXEC = $(top_builddir)/lustre/utils/liblustreapi.a $(top_builddir)/lustre/liblustre/liblustre.a $(CAP_LIBS) $(PTHREAD_LIBS)
$(ZLIB)
+LLIB_EXEC = $(top_builddir)/lustre/utils/liblustreapi.a $(top_builddir)/lustre/liblustre/liblustre.a $(CAP_LIBS) $(PTHREAD_LIBS)
if LIBLUSTRE
noinst_LIBRARIES = libtestcommon.a
if LIBLUSTRE_TESTS
if LIBLUSTRE
noinst_LIBRARIES = libtestcommon.a
if LIBLUSTRE_TESTS
+if MPITESTS
+SUBDIRS = mpi
+endif # MPITESTS
+
noinst_PROGRAMS = sanity
noinst_PROGRAMS = sanity
-if !CRAY_XT3
noinst_PROGRAMS += recovery_small replay_single replay_ost_single
noinst_PROGRAMS += recovery_small replay_single replay_ost_single
-endif # !CRAY_XT3
-
-if MPITESTS
-noinst_PROGRAMS += test_lock_cancel
-endif # MPITESTS
liblustre_testdir=$(libdir)/lustre/liblustre/tests
liblustre_test_PROGRAMS = $(noinst_PROGRAMS)
liblustre_testdir=$(libdir)/lustre/liblustre/tests
liblustre_test_PROGRAMS = $(noinst_PROGRAMS)
@@
-27,6
+25,8
@@
liblustre_test_LIBRARIES = $(noinst_LIBRARIES)
endif # LIBLUSTRE_TESTS
endif # LIBLUSTRE
endif # LIBLUSTRE_TESTS
endif # LIBLUSTRE
+DIST_SUBDIRS = mpi
+
libtestcommon_a_SOURCES = test_common.c test_common.h
sanity_SOURCES = sanity.c
libtestcommon_a_SOURCES = test_common.c test_common.h
sanity_SOURCES = sanity.c
@@
-48,12
+48,3
@@
replay_ost_single_SOURCES = replay_ost_single.c
replay_ost_single_CFLAGS = $(LL_CFLAGS)
replay_ost_single_LDADD := libtestcommon.a $(LLIB_EXEC)
replay_ost_single_DEPENDENCIES = $(top_builddir)/lustre/liblustre/liblustre.a libtestcommon.a
replay_ost_single_CFLAGS = $(LL_CFLAGS)
replay_ost_single_LDADD := libtestcommon.a $(LLIB_EXEC)
replay_ost_single_DEPENDENCIES = $(top_builddir)/lustre/liblustre/liblustre.a libtestcommon.a
-
-if MPITESTS
-test_lock_cancel_SOURCES = test_lock_cancel.c
-test_lock_cancel_CFLAGS = $(LL_CFLAGS) -I/opt/lam/include
-#test_lock_cancel_LDADD := $(LLIB_EXEC) -L/opt/lam/lib -lmpi -llam
-test_lock_cancel_LDADD := $(LLIB_EXEC) -lmpich
-endif
-
-