Branch b1_8_gate

b=15924
i=johann

add a test case for bug 15924, combine flock tests code into a single file
flocks_test.c

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index cc363dc..2ab4564 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -59,6 +59,9 @@ multiop_LDADD=$(LIBLUSTREAPI)
 ll_dirstripe_verify_SOURCES= ll_dirstripe_verify.c
 ll_dirstripe_verify_LDADD= -L$(top_builddir)/lustre/utils -llustreapi
 
+flocks_test_SOURCES=flocks_test.c
+flocks_test_LDADD=-lpthread
+
 if MPITESTS
 #LAM_LD_FLAGS=-L/opt/lam/lib -lmpi -llam -lpthread
 LAM_LD_FLAGS=-lmpich -lpthread