Menu
▾
▴
[Ltp-commits] [Git] ltp updated.
|
From: Garrett C. <ris...@li...> - 2010-06-27 01:48:58
|
The branch, pu, has been updated
via 0bf0d385d0cdbcb6407a547118112126e28b0175 (commit)
via 9cda97cee9dafc96c17806141c795dbf41d9e804 (commit)
via 246625cedf2827f4c810bead096cce3be1b6fc8d (commit)
via 9efd7b43362cc1647a1f297014ee86a2d5dc2775 (commit)
from 4aaa81f17ce66894139a1e27eccba85dae34ea54 (commit)
- Log -----------------------------------------------------------------
commit 0bf0d385d0cdbcb6407a547118112126e28b0175
Author: Garrett Cooper <yan...@gm...>
Date: Sat Jun 26 18:39:02 2010 -0700
Clean up Makefile.
Signed-off-by: Garrett Cooper <yan...@gm...>
commit 9cda97cee9dafc96c17806141c795dbf41d9e804
Author: Garrett Cooper <yan...@gm...>
Date: Sat Jun 26 18:36:41 2010 -0700
Clean up script usage and prefix files with '.'
This is being done to simplify Makefile generation and prune out
misleading text.
Signed-off-by: Garrett Cooper <yan...@gm...>
commit 246625cedf2827f4c810bead096cce3be1b6fc8d
Author: Garrett Cooper <yan...@gm...>
Date: Sun Jun 20 22:17:36 2010 -0700
Fix typos.
Signed-off-by: Garrett Cooper <yan...@gm...>
commit 9efd7b43362cc1647a1f297014ee86a2d5dc2775
Author: Garrett Cooper <yan...@gm...>
Date: Sun Jun 20 22:12:41 2010 -0700
Clean up style and yank unused MAKEFILE reference.
Signed-off-by: Garrett Cooper <yan...@gm...>
-----------------------------------------------------------------------
Summary of changes:
.../conformance/interfaces/timer_getoverrun/4-1.sh | 2 +-
.../conformance/interfaces/timer_getoverrun/5-1.sh | 2 +-
.../conformance/interfaces/timer_settime/4-1.sh | 2 +-
.../functional/threads/Makefile | 18 ++---
.../functional/threads/pi_test/Makefile | 6 +-
testcases/open_posix_testsuite/locate-test | 86 +++++++++-----------
6 files changed, 55 insertions(+), 61 deletions(-)
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/4-1.sh b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/4-1.sh
index 49de01b..69d5fc5 100755
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/4-1.sh
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/4-1.sh
@@ -9,5 +9,5 @@
#
# This is tested implicitly via assertion 2.
-echo "Tested implicitly via assertion 2. Sett output for status."
+echo "Tested implicitly via assertion 2. Set output for status."
exit 0
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/5-1.sh b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/5-1.sh
index 0d4d5ca..a9e7b5a 100755
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/5-1.sh
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_getoverrun/5-1.sh
@@ -9,5 +9,5 @@
#
# This is tested implicitly via assertion 6.
-echo "Tested implicitly via assertion 6. Sett output for status."
+echo "Tested implicitly via assertion 6. Set output for status."
exit 0
diff --git a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/4-1.sh b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/4-1.sh
index de1fba0..3c06015 100755
--- a/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/4-1.sh
+++ b/testcases/open_posix_testsuite/conformance/interfaces/timer_settime/4-1.sh
@@ -11,5 +11,5 @@
#
# This is tested implicitly via assertion 1, since a relative timer is used.
-echo "Tested implicitly via assertion 1. Sett output for status."
+echo "Tested implicitly via assertion 1. Set output for status."
exit 0
diff --git a/testcases/open_posix_testsuite/functional/threads/Makefile b/testcases/open_posix_testsuite/functional/threads/Makefile
index e8cc701..1b70252 100644
--- a/testcases/open_posix_testsuite/functional/threads/Makefile
+++ b/testcases/open_posix_testsuite/functional/threads/Makefile
@@ -1,12 +1,10 @@
-SUBDIRS= robust_test pi_test
+#
+# Read COPYING for licensing details.
+#
+# Garrett Cooper, June 2010
+#
-all test:
- for d in $(SUBDIRS); do \
- $(MAKE) -C $$d $@; \
- done
-
-clean:
- rm -f *~
- for d in $(SUBDIRS); do \
- $(MAKE) -C $$d $@; \
+all clean install test:
+ for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \
+ $(MAKE) -C $$dir $@; \
done
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/Makefile b/testcases/open_posix_testsuite/functional/threads/pi_test/Makefile
index c887ef2..d053848 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/Makefile
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/Makefile
@@ -2,10 +2,14 @@ CFLAGS+= -I../include
LDLIBS= -lpthread
TARGETS= pitest-1 pitest-2 pitest-3 pitest-4 pitest-5 pitest-6
-all: $(TARGETS)
+all install: $(TARGETS)
clean:
-rm -rf $(TARGETS)
test:
./run.sh
+all clean install test:
+ for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \
+ $(MAKE) -C $$dir $@; \
+ done
diff --git a/testcases/open_posix_testsuite/locate-test b/testcases/open_posix_testsuite/locate-test
index 47386c9..e18642c 100755
--- a/testcases/open_posix_testsuite/locate-test
+++ b/testcases/open_posix_testsuite/locate-test
@@ -1,12 +1,10 @@
#! /bin/sh
# Copyright (c) 2002, 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
+# This file is licensed under the GPLv2 license. For the full content
# of this license, see the COPYING file at the top level of this
# source tree.
-# Added FreeBSD compatibility changes by Craig Rodrigues
-
usage()
{
cat <<EOF
@@ -20,10 +18,6 @@ and down.
If you just want to build a test, but not run it,
do not include a main function into the .c file or
name it something including the "-buildonly" string.
- --fmake Find functional makefiles.
- --smake Find stress makefiles.
- --frun Find functional run.sh files.
- --srun Find stress run.sh files.
--help Show this help and exit
Filenames need to follow some standarized format for them to be picked
@@ -42,8 +36,6 @@ not support TESTs compiled from many different sources.
EOF
}
-MAKEFILE=GNUmakefile
-
buildable="";
execs=""
print_execs=0
@@ -51,40 +43,40 @@ print_execs=0
# Go through the cmd line options
while true
do
- case "$1" in
- "--buildable")
- buildable="( -name [0-9]*-*.c ! -name [0-9]*-[0-9]*.sh )";
- shift;
- ;;
- "--execs")
- print_execs=1;
- execs="( ( -name [0-9]*-[0-9]*.c -o -name [0-9]*-[0-9]*.sh ) -a ! -name *-buildonly* )";
- shift;
- ;;
- "--help")
- usage;
- exit 0;
- ;;
- --*)
- echo "Unknown option $1" 1>&2;
- usage 1>&2;
- exit 1;
- ;;
- *)
- break 2;
- ;;
- esac
+ case "$1" in
+ "--buildable")
+ buildable="( -name [0-9]*-*.c ! -name [0-9]*-[0-9]*.sh )"
+ shift
+ ;;
+ "--execs")
+ print_execs=1
+ execs="( ( -name [0-9]*-[0-9]*.c -o -name [0-9]*-[0-9]*.sh ) -a ! -name *-buildonly* )"
+ shift
+ ;;
+ "--help")
+ usage
+ exit 0
+ ;;
+ --*)
+ echo >&2 "Unknown option $1"
+ usage >&2
+ exit 1
+ ;;
+ *)
+ break 2
+ ;;
+ esac
done
# Simple version right now, just locate all:
-WHERE=${1:-$PWD}
+WHERE=${1:-.}
# Need the DIRECTORY arg ...
if [ ! -d "$WHERE" ]
then
- echo "Error: no root directory specified" 1>&2
- usage >&2
- exit 1
+ echo >&2 "Error: no root directory specified"
+ usage >&2
+ exit 1
fi
# Force something .c or .sh
@@ -92,14 +84,14 @@ fi
# IF --execs, force it has no "-buildonly"
# If --buildable, remove the .sh files
find "$WHERE" -type f \
- \( \
- \( -name "[0-9]*-*.c" -o -name "[0-9]*-[0-9]*.sh" \) \
- ! -name \*.o ! -name \*~ \
- \) \
- $buildable $execs | \
- if [ $print_execs -eq 1 ]
- then
- sed 's/\.\(sh\|c\)$/.test/'
- else
- cat
- fi
+ \( \
+ \( -name "[0-9]*-*.c" -o -name "[0-9]*-[0-9]*.sh" \) \
+ ! -name \*.o ! -name \*~ \
+ \) \
+ $buildable $execs | \
+ if [ $print_execs -eq 1 ]
+ then
+ sed 's/\.\(sh\|c\)$/.test/'
+ else
+ cat
+ fi
hooks/post-receive
--
ltp
|
