tests/Makefile.am: remove ldaptest.c from build list, it doesn't build

tests/*.sh: add ptlrpc setup to config scripts
tests/runtests: use "sh ll*.sh" in case the script isn't executable

diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index c3273ec..241ea28 100644 (file)
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -146,10 +146,10 @@ static struct super_block * ll_read_super(struct super_block *sb,
         }
 
         err = connmgr_connect(ptlrpc_connmgr, sbi->ll_mds_conn);
-        if (err) { 
-                CERROR("cannot connect to MDS\n"); 
+        if (err) {
+                CERROR("cannot connect to MDS\n");
                 GOTO(out_disc, sb = NULL);
-        }                
+        }
 
         sbi->ll_rootino = 2;
 

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 59d69a9..3fbd2e0 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -2,7 +2,7 @@ DEFS:=
 CPPFLAGS := -g -I. -I$(PORTALS)/include -I$(top_srcdir)/include -Wall -D_LARGEFILE64_SOURCE
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
-bin_PROGRAMS = ldaptest openunlink testreq truncate
+bin_PROGRAMS = openunlink testreq truncate #ldaptest 
 
 # ldaptest_SOURCES = ldaptest.c
 testreq_SOURCES = testreq.c

diff --git a/lustre/tests/llext3.sh b/lustre/tests/llext3.sh
index 534879a..fad08b6 100755 (executable)
--- a/lustre/tests/llext3.sh
+++ b/lustre/tests/llext3.sh
@@ -32,6 +32,9 @@ setup 1
 device 3
 attach osc
 setup -1
+device 4
+attach ptlrpc
+setup
 quit
 EOF
 

diff --git a/lustre/tests/llrext3.sh b/lustre/tests/llrext3.sh
index 79fe4c2..443679c 100755 (executable)
--- a/lustre/tests/llrext3.sh
+++ b/lustre/tests/llrext3.sh
@@ -32,6 +32,9 @@ setup 1
 device 3
 attach osc
 setup -1
+device 4
+attach ptlrpc
+setup
 quit
 EOF
 

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 69f6ad9..5f2de74 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -32,6 +32,9 @@ setup 1
 device 3
 attach osc
 setup -1
+device 4
+attach ptlrpc
+setup
 quit
 EOF
 

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 2a5b77b..648dad6 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -10,7 +10,7 @@ PATH=$PATH:$RUNDIR
 
 ERROR=
 
-[ "`mount | grep /mnt/obd`" ] || echo | llmount.sh || exit 1
+[ "`mount | grep /mnt/lustre`" ] || echo | sh llmount.sh || exit 1
 
 # let's start slowly here...
 touch /mnt/lustre || exit 2
@@ -29,9 +29,9 @@ done
 
 [ "$ERROR" ] && exit $ERROR
 
-llmountcleanup.sh
+sh llmountcleanup.sh
 
-echo | llrmount.sh || exit 20
+echo | sh llrmount.sh || exit 20
 echo "comparing previously copied files"
 diff -u /etc/hosts /mnt/lustre/hosts || exit 21
 
@@ -45,4 +45,4 @@ rm /mnt/lustre/hosts || exit 23
 
 rm -r /mnt/lustre/etc || exit 24
 
-llmountcleanup.sh
+sh llmountcleanup.sh