[Ltp-commits] [Git] ltp updated.

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

The branch, pu, has been updated
       via  da5651247bdf23c20a971b48614849ac942d7f20 (commit)
       via  d309fa0607bf70af04be750e57e9346c6790fbc3 (commit)
       via  8f1b81c4da104171651fa9fe59c66c398b2fbfcd (commit)
      from  094d369f06607e37d76d697844f75272755cf969 (commit)


- Log -----------------------------------------------------------------
commit da5651247bdf23c20a971b48614849ac942d7f20
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jul 4 23:53:47 2010 -0700

    Omit the *_scenarii.c files b/c they're #include'd
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

commit d309fa0607bf70af04be750e57e9346c6790fbc3
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jul 4 23:53:33 2010 -0700

    Mute noise again.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

commit 8f1b81c4da104171651fa9fe59c66c398b2fbfcd
Author: Garrett Cooper <yan...@gm...>
Date:   Sun Jul 4 23:52:20 2010 -0700

    Only produce Makefile.3 if it does not exist.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

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

Summary of changes:
 testcases/open_posix_testsuite/Makefile            |    8 ++++----
 .../interfaces/{pthread_atfork => getpid}/LDLIBS   |    0
 .../scripts/generate-makefiles.sh                  |    6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)
 copy testcases/open_posix_testsuite/conformance/interfaces/{pthread_atfork => getpid}/LDLIBS (100%)
 
diff --git a/testcases/open_posix_testsuite/Makefile b/testcases/open_posix_testsuite/Makefile
index 55f5f1f..0816099 100644
--- a/testcases/open_posix_testsuite/Makefile
+++ b/testcases/open_posix_testsuite/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2002, Intel Corporation. All rights reserved.
+# Copyright (c) 2003, Intel Corporation. All rights reserved.
 # Created by:  inaky.perez-gonzalez REMOVE-THIS AT intel DOT com
 # This file is licensed under the GPL license.  For the full content
 # of this license, see the COPYING file at the top level of this
@@ -65,7 +65,7 @@ tools:
 # Test build and execution targets.
 conformance-all: $(CRITICAL_CONFORMANCE_MAKEFILE)
 	@rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@
-	$(BUILD_MAKE) -C conformance all
+	@$(BUILD_MAKE) -C conformance all
 
 conformance-test:
 	@rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@
@@ -73,7 +73,7 @@ conformance-test:
 
 functional-all: $(CRITICAL_FUNCTIONAL_MAKEFILE)
 	@rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@
-	$(BUILD_MAKE) -C functional all
+	@$(BUILD_MAKE) -C functional all
 
 functional-test:
 	@rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@
@@ -81,7 +81,7 @@ functional-test:
 
 stress-all: $(CRITICAL_STRESS_MAKEFILE)
 	@rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@
-	$(BUILD_MAKE) -C stress all
+	@$(BUILD_MAKE) -C stress all
 
 stress-test:
 	@rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/LDLIBS b/testcases/open_posix_testsuite/conformance/interfaces/getpid/LDLIBS
similarity index 100%
copy from testcases/open_posix_testsuite/conformance/interfaces/pthread_atfork/LDLIBS
copy to testcases/open_posix_testsuite/conformance/interfaces/getpid/LDLIBS
diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
index 85cf00d..2e9ca76 100755
--- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
+++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
@@ -103,7 +103,9 @@ MAKE_TARGETS+=		${make_target_prereq_cache}
 
 EOF
 
-	cat > "$makefile.3" <<EOF
+	if [ ! -f "$makefile.3" ]; then
+
+		cat > "$makefile.3" <<EOF
 all: \$(MAKE_TARGETS)
 
 clean:
@@ -122,6 +124,8 @@ test: all
 
 EOF
 
+	fi
+
 	# Produce _awesome_ target rules for everything that needs it.
 	for prereq in ${make_target_prereq_cache}; do
 


hooks/post-receive
-- 
ltp