[Ltp-commits] [Git] ltp updated.

[Garrett C. <ris...@li...>]

The branch, pu, has been updated
       via  c54cefe1191a6d959eace2812d27e406e176b122 (commit)
       via  1b8bcedd85f2c99d2850b4eb23ba8a83e5b4f16a (commit)
      from  3cc6f028b8eeda2e20f308dc8a81020332d8c524 (commit)


- Log -----------------------------------------------------------------
commit c54cefe1191a6d959eace2812d27e406e176b122
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jun 20 16:02:39 2010 -0700

    Mute stdout noise from make clean for functional.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

commit 1b8bcedd85f2c99d2850b4eb23ba8a83e5b4f16a
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jun 20 15:58:34 2010 -0700

    Mop up makefiles.
    
    1. make clean was failing unnecessarily because rm was being called instead
    of rm -f.
    2. Clean up Makefiles to make the style consistent across the board.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

-----------------------------------------------------------------------

Summary of changes:
 testcases/open_posix_testsuite/GNUmakefile         |    4 +-
 .../functional/semaphores/GNUmakefile              |   18 +++++++---------
 .../functional/timers/clocks/GNUmakefile           |   22 ++++++++-----------
 .../functional/timers/timers/GNUmakefile           |   19 +++++++----------
 4 files changed, 27 insertions(+), 36 deletions(-)
 
diff --git a/testcases/open_posix_testsuite/GNUmakefile b/testcases/open_posix_testsuite/GNUmakefile
index e1775ff..fe49195 100644
--- a/testcases/open_posix_testsuite/GNUmakefile
+++ b/testcases/open_posix_testsuite/GNUmakefile
@@ -66,8 +66,8 @@ clean:
 	-@# Build runnable tests
 	-@find $(top_builddir) -iname \*.test | xargs -n 40 rm -f {}
 	-@find $(top_builddir) -iname \*~ -o -iname \*.o | xargs -n 40 rm -f {}
-	-@for d in $(FUNCTIONAL_MAKE); do \
-	    $(MAKE) -C $$d clean; \
+	@for d in $(FUNCTIONAL_MAKE); do \
+	    $(MAKE) -C $$d clean >/dev/null; \
 	done
 
 # Rule to run a build test
diff --git a/testcases/open_posix_testsuite/functional/semaphores/GNUmakefile b/testcases/open_posix_testsuite/functional/semaphores/GNUmakefile
index d944b86..348585c 100644
--- a/testcases/open_posix_testsuite/functional/semaphores/GNUmakefile
+++ b/testcases/open_posix_testsuite/functional/semaphores/GNUmakefile
@@ -1,15 +1,13 @@
+CPPFLAGS+=	-I../../include
+LDLIBS+=	-lpthread
 
-INCLUDE = -I../../include
-LIB=
+TARGETS=	sem_lock.test sem_conpro.test sem_readerwriter.test \
+		sem_philosopher.test sem_sleepingbarber.test
 
-CFLAGS=-Wall -O2 -g 
+all: $(TARGETS)
 
-all:  make-test
-make-test: sem_lock.test sem_conpro.test sem_readerwriter.test sem_philosopher.test sem_sleepingbarber.test
+%.test: %.o
+	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -o $@
 
-%.test : %.c
-	$(CC) $(CFLAGS) $(INCLUDE) $< -o $@ $(LIB) -lpthread  
 clean: 
-	rm *.test
-
- 
+	rm -f $(TARGETS)
diff --git a/testcases/open_posix_testsuite/functional/timers/clocks/GNUmakefile b/testcases/open_posix_testsuite/functional/timers/clocks/GNUmakefile
index e63c977..805a496 100644
--- a/testcases/open_posix_testsuite/functional/timers/clocks/GNUmakefile
+++ b/testcases/open_posix_testsuite/functional/timers/clocks/GNUmakefile
@@ -5,19 +5,15 @@
 # source tree.
 #
 
-#CFLAGS = -g -O2 -Wall -Werror
-CFLAGS = -g -O2 -Wall -Werror -DDEBUG
+CPPFLAGS+=	-I../../../include
+LDLIBS+=	-lrt
 
-INCLUDE = -I../../../include
+TARGETS=	twopsetclock.test invaliddates.test
 
-LDPATH =
+all: $(TARGETS)
 
-LIB = -lrt
-
-all:	twopsetclock.test invaliddates.test
-
-%.test : %.c
-	$(CC) $(CFLAGS) $(INCLUDE) $< -o $@ $(LDPATH) $(LIB)
-
-clean :
-	rm *.test
+%.test: %.o
+	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -o $@
+	
+clean:
+	rm -f $(TARGETS)
diff --git a/testcases/open_posix_testsuite/functional/timers/timers/GNUmakefile b/testcases/open_posix_testsuite/functional/timers/timers/GNUmakefile
index cdd1154..edbb35d 100644
--- a/testcases/open_posix_testsuite/functional/timers/timers/GNUmakefile
+++ b/testcases/open_posix_testsuite/functional/timers/timers/GNUmakefile
@@ -5,18 +5,15 @@
 # source tree.
 #
 
-CFLAGS = -g -O2 -Wall -Werror
+CPPFLAGS+=	-I../../../include
+LDLIBS=		-lrt
 
-INCLUDE = -I../../../include
+TARGETS=	twoevtimers.test twoptimers.test
 
-LDPATH =
+all: $(TARGETS)
 
-LIB = -lrt
+%.test: %.o
+	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -o $@
 
-all:	twoevtimers.test twoptimers.test
-
-%.test : %.c
-	$(CC) $(CFLAGS) $(INCLUDE) $< -o $@ $(LDPATH) $(LIB)
-
-clean :
-	rm *.test
+clean:
+	rm -f $(TARGETS)


hooks/post-receive
-- 
ltp