[PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Akshay Lal]

Current the Makefile only builds the .c files and installs
them in the $INSTALL path. However, the ltp directory contains a shell script,
which doen't get copied over (installed) when a "make install"is invoked.

This behaviour causes test 080 to fail since it requires rwtest.sh to be
present in the ltp/ directory.

Tested: Updated the Makefile and ran a static build script & test
080.

Signed-off-by: Akshay Lal <akshaylal@google.com>
---
 ltp/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ltp/Makefile b/ltp/Makefile
index 32cd380..d47247b 100644
--- a/ltp/Makefile
+++ b/ltp/Makefile
@@ -6,6 +6,7 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs

 TARGETS = doio fsstress fsx growfiles iogen
+SCRIPTS = rwtest.sh
 CFILES = $(TARGETS:=.c)
 HFILES = doio.h
 LDIRT = $(TARGETS)
@@ -44,5 +45,6 @@ $(TARGETS): $(LIBTEST)
 install: default
       $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/ltp
       $(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/ltp
+       $(INSTALL) -m 755 $(SCRIPTS) $(PKG_LIB_DIR)/ltp

 -include .dep
--
1.7.3.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Christoph Hellwig]

On Fri, Jul 01, 2011 at 01:52:43PM -0700, Akshay Lal wrote:
> Current the Makefile only builds the .c files and installs
> them in the $INSTALL path. However, the ltp directory contains a shell script,
> which doen't get copied over (installed) when a "make install"is invoked.
> 
> This behaviour causes test 080 to fail since it requires rwtest.sh to be
> present in the ltp/ directory.
> 
> Tested: Updated the Makefile and ran a static build script & test
> 080.

Thanks, applied.  (after fixing up mailer induced whitespace issues)

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Alex Elder]

On Wed, 2011-07-13 at 08:13 -0400, Christoph Hellwig wrote:
> On Fri, Jul 01, 2011 at 01:52:43PM -0700, Akshay Lal wrote:
> > Current the Makefile only builds the .c files and installs
> > them in the $INSTALL path. However, the ltp directory contains a shell script,
> > which doen't get copied over (installed) when a "make install"is invoked.
> > 
> > This behaviour causes test 080 to fail since it requires rwtest.sh to be
> > present in the ltp/ directory.
> > 
> > Tested: Updated the Makefile and ran a static build script & test
> > 080.
> 
> Thanks, applied.  (after fixing up mailer induced whitespace issues)

I see that test 80 is not part of the "auto" group.  Anyone
know why not?  I'm not even sure what it does; it may just
be unnecessary because it duplicates what other tests do.

But it's really quick (under 10 seconds even without speedy
hardware) so I don't see any harm to adding it to "auto" as
well as "quick".

Any thoughts?

					-Alex

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Christoph Hellwig]

I'm fine with enabling 080 by default, it passes for me.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Dave Chinner]

On Wed, Jul 13, 2011 at 11:43:36PM -0400, Christoph Hellwig wrote:
> I'm fine with enabling 080 by default, it passes for me.

It needs /bin/sh -> /bin/bash conversion first - the current version
fails miserably without that on all my test systems....

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Christoph Hellwig]

On Thu, Jul 14, 2011 at 02:03:26PM +1000, Dave Chinner wrote:
> On Wed, Jul 13, 2011 at 11:43:36PM -0400, Christoph Hellwig wrote:
> > I'm fine with enabling 080 by default, it passes for me.
> 
> It needs /bin/sh -> /bin/bash conversion first - the current version
> fails miserably without that on all my test systems....

Does the simple s/sh/bash/ fix it for you?

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/1] Fix the ltp Makefile to allow for installation of all non-c (scripts) files

[Alex Elder]

On Thu, 2011-07-14 at 10:58 -0400, Christoph Hellwig wrote:
> On Thu, Jul 14, 2011 at 02:03:26PM +1000, Dave Chinner wrote:
> > On Wed, Jul 13, 2011 at 11:43:36PM -0400, Christoph Hellwig wrote:
> > > I'm fine with enabling 080 by default, it passes for me.
> > 
> > It needs /bin/sh -> /bin/bash conversion first - the current version
> > fails miserably without that on all my test systems....
> 
> Does the simple s/sh/bash/ fix it for you?

Dave, I figured out that you must have been talking about
ltp/rwtest.sh needing to be converted to bash.

I got rid of my /bin/sh and /usr/bin/sh symlinks and tried it
out.  Turns out I can make some progress on it, but I now
find that /usr/sbin/xfs_check specifies /bin/sh as its interpreter.

I got around that by using "xfs_repair -n" for XFS_CHECK_PROG,
and outside of it producing different output the test seems
to work OK.

What else, specifically are you running into?  And if you
have trouble with the /bin/sh in rwtest.sh, why are you not
running into similar trouble with xfs_check?  I don't mind
doing the fix, but now I'm not sure what's required.

					-Alex

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs