land b1_5 onto HEAD

[fs/lustre-release.git] / lustre / tests / Makefile.am

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index c81ec07..0f167e0 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -1,44 +1,42 @@
 # Lustre test Makefile
-AM_CPPFLAGS = $(LLCPPFLAGS) -I/opt/lam/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+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
 
-pkgexample_scripts = llmount.sh llmountcleanup.sh llecho.sh llechocleanup.sh
-pkgexample_scripts += local.sh echo.sh uml.sh lov.sh
-
 noinst_DATA =
-noinst_SCRIPTS = leak_finder.pl llecho.sh llmount.sh llmountcleanup.sh tbox.sh
-noinst_SCRIPTS += llrmount.sh runfailure-mds runvmstat runfailure-net
+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 = $(pkgexample_scripts) $(noinst_SCRIPTS) $(noinst_DATA) \
-       sanity.sh rundbench
-if TESTS
-pkgexample_SCRIPTS = $(pkgexample_scripts)
 
-noinst_PROGRAMS = openunlink testreq truncate directio openme writeme open_delay
+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 statmany multifstat createtest mlink utime
+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 mkdirdeep o_directory
+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
+noinst_PROGRAMS += mmap_sanity flock_test writemany random-reads flocks_test
 if MPITESTS
 noinst_PROGRAMS += parallel_grouplock write_append_truncate createmany_mpi
 endif
-# noinst_PROGRAMS += ldaptest copy_attr
+# noinst_PROGRAMS += ldaptest copy_attr mkdirdeep 
 bin_PROGRAMS = mcreate munlink
 endif # TESTS
 
-# ldaptest_SOURCES = ldaptest.c
-
 stat_SOURCES = stat.c stat_fs.h
-mkdirdeep_LDADD=-L$(top_builddir)/portals/utils -lptlctl $(LIBREADLINE)
+# mkdirdeep_LDADD=-L$(top_builddir)/lnet/utils -lptlctl $(LIBREADLINE)
 mmap_sanity_SOURCES= mmap_sanity.c
 
 if MPITESTS
@@ -50,3 +48,5 @@ 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