X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2FMakefile.am;h=0b4a9150daadbb7a1c8bdedd0030b349999bde84;hb=aa65c1c3bf81caeedd7f075d695e3b322f8a7efa;hp=2484b7338044c4361852e4e970a85c1a2d46e044;hpb=67e9e13ac21c0bbe8ef2ef95c76d30af4ea486e3;p=fs%2Flustre-release.git

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 2484b73..0b4a915 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -1,48 +1,56 @@
 # Lustre test Makefile
-DEFS=
-CPPFLAGS = -I. -I$(PORTALS)/include -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE
-CFLAGS := -g -Wall
+AM_CPPFLAGS = $(LLCPPFLAGS) -I/opt/lam/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS
+AM_CFLAGS = $(LLCFLAGS)
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
-EXTRA_DIST = $(pkgexample_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
-	common.sh lustre.cfg \
-	client-echo.cfg    elan-server.cfg  net-client.cfg  obdecho.cfg \
-	client-mount.cfg   ldlm.cfg         net-local.cfg   obdfilter.cfg \
-	client-mount2.cfg  lustre.cfg       net-server.cfg \
-	elan-client.cfg    mds.cfg 	trivial.sh
-pkgexampledir = '${exec_prefix}/usr/lib/$(PACKAGE)/examples'
-pkgexample_SCRIPTS = llmount.sh llmountcleanup.sh llecho.sh local.sh uml.sh lov.sh
-noinst_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
-noinst_DATA = lustre.cfg
-noinst_SCRIPTS += fs.sh intent-test.sh intent-test2.sh leak_finder.pl \
-	lldlm.sh llecho.sh llext3.sh llmodules.sh llmount-client.sh \
-	llmount-server.sh llmount.sh llmountcleanup.sh llrext3.sh \
-	llrmount.sh llsimple.sh  mdcreq.sh mdcreqcleanup.sh \
-	ostreq.sh runfailure-client-mds-recover.sh runfailure-mds \
-	runfailure-net runfailure-ost runiozone runregression-net.sh \
-	runtests runvmstat snaprun.sh tbox.sh  common.sh
-noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate
-noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw openclose createdestroy
-noinst_PROGRAMS += lovstripe stat createmany mkdirmany # ldaptest 
-
-# ldaptest_SOURCES = ldaptest.c
-tchmod_SOURCES = tchmod.c
-toexcl_SOURCES = toexcl.c
-testreq_SOURCES = testreq.c
-mcreate_SOURCES = mcreate.c
-munlink_SOURCES = munlink.c
-truncate_SOURCES = truncate.c
-directio_SOURCES = directio.c
-openunlink_SOURCES = openunlink.c
-openme_SOURCES = openme.c
-writeme_SOURCES = writeme.c
-fsx_SOURCES = fsx.c
-test_brw_SOURCES = test_brw.c
-openclose_SOURCES = openclose.c
-createdestroy_SOURCES = createdestroy.c
-lovstripe_SOURCES = lovstripe.c
-stat_SOURCES = stat.c
-createmany_SOURCES = createmany.c
-mkdirmany_SOURCES = mkdirmany.c
-
-include $(top_srcdir)/Rules
+
+noinst_DATA =
+noinst_SCRIPTS = leak_finder.pl llecho.sh llmount.sh llmountcleanup.sh test-framework.sh
+noinst_SCRIPTS += runfailure-mds runvmstat runfailure-net
+noinst_SCRIPTS += runfailure-ost runiozone runregression-net.sh runtests
+noinst_SCRIPTS += sanity.sh rundbench
+noinst_SCRIPTS += cfg/local.sh
+
+
+EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA) \
+             sanity.sh rundbench \
+             acl/run acl/make-tree acl/getfacl-noacl.test acl/cp.test \
+             acl/setfacl.test acl/permissions.test acl/misc.test \
+             acl/inheritance.test
+
+if TESTS
+noinst_PROGRAMS = openunlink testreq truncate directio openme writeme
+noinst_PROGRAMS += tchmod toexcl fsx test_brw openclose createdestroy
+noinst_PROGRAMS += stat createmany chownmany statmany multifstat createtest mlink utime
+noinst_PROGRAMS += opendirunlink opendevunlink unlinkmany fchdir_test checkstat
+noinst_PROGRAMS += wantedi statone runas openfile getdents o_directory
+noinst_PROGRAMS += small_write multiop sleeptest ll_sparseness_verify cmknod
+noinst_PROGRAMS += ll_sparseness_write mrename ll_dirstripe_verify mkdirmany rmdirmany
+noinst_PROGRAMS += openfilleddirunlink rename_many memhog iopentest1 iopentest2
+noinst_PROGRAMS += mmap_sanity flock_test writemany random-reads flocks_test
+noinst_PROGRAMS += ll_getstripe_info
+if MPITESTS
+noinst_PROGRAMS += parallel_grouplock write_append_truncate createmany_mpi
+endif
+# noinst_PROGRAMS += ldaptest copy_attr mkdirdeep 
+bin_PROGRAMS = mcreate munlink
+endif # TESTS
+
+stat_SOURCES = stat.c stat_fs.h
+# mkdirdeep_LDADD=-L$(top_builddir)/lnet/utils -lptlctl $(LIBREADLINE)
+mmap_sanity_SOURCES= mmap_sanity.c
+
+LIBLUSTREAPI := $(top_builddir)/lustre/utils/liblustreapi.a
+ll_getstripe_info_LDADD=$(LIBLUSTREAPI)
+
+if MPITESTS
+LAM_LD_FLAGS=-L/opt/lam/lib -lmpi -llam -lpthread
+write_append_truncate_SOURCES=write_append_truncate.c
+write_append_truncate_LDADD=$(LAM_LD_FLAGS)
+createmany_mpi_SOURCES=createmany-mpi.c
+createmany_mpi_LDADD=$(LAM_LD_FLAGS)
+parallel_grouplock_SOURCES=parallel_grouplock.c lp_utils.c
+parallel_grouplock_LDADD=$(LAM_LD_FLAGS)
+endif
+
+#copy_attr_LDADD= -lattr