[Glibc-bsd-commits] r1937 - in trunk/posixtestsuite/debian: . patches
guillem at alioth.debian.org
guillem at alioth.debian.org
Fri May 18 04:48:17 UTC 2007
Author: guillem
Date: 2007-05-18 04:48:17 +0000 (Fri, 18 May 2007)
New Revision: 1937
Added:
trunk/posixtestsuite/debian/patches/02_timeout.patch
Removed:
trunk/posixtestsuite/debian/patches/02_expect.diff
Modified:
trunk/posixtestsuite/debian/changelog
Log:
- debian/patches/02_expect.diff: Renamed to ...
- debian/patches/02_timeout.patch: ... this. Made all run.sh scripts
use the provided timeout script.
Modified: trunk/posixtestsuite/debian/changelog
===================================================================
--- trunk/posixtestsuite/debian/changelog 2007-05-17 17:29:23 UTC (rev 1936)
+++ trunk/posixtestsuite/debian/changelog 2007-05-18 04:48:17 UTC (rev 1937)
@@ -2,6 +2,9 @@
* New upstream release.
- debian/patches/00_find_warnings.patch: Removed, merged upstream.
+ - debian/patches/02_expect.diff: Renamed to ...
+ - debian/patches/02_timeout.patch: ... this. Made all run.sh scripts
+ use the provided timeout script.
* Fix FSF's copyright address.
* Switched to quilt:
- Add new debian/patches/series file.
Deleted: trunk/posixtestsuite/debian/patches/02_expect.diff
===================================================================
--- trunk/posixtestsuite/debian/patches/02_expect.diff 2007-05-17 17:29:23 UTC (rev 1936)
+++ trunk/posixtestsuite/debian/patches/02_expect.diff 2007-05-18 04:48:17 UTC (rev 1937)
@@ -1,115 +0,0 @@
---- Makefile 2004-07-07 16:19:07.000000000 +0200
-+++ Makefile 2004-09-01 18:41:01.000000000 +0200
-@@ -35,7 +35,10 @@
- all: build-tests run-tests
-
- build-tests: $(BUILD_TESTS:.c=.test)
--run-tests: $(RUN_TESTS:.test=.run-test)
-+run-tests:
-+ -chmod 755 make_is_dumb ; for i in $(RUN_TESTS) ; do \
-+ ./make_is_dumb $$i ; \
-+ done
-
- functional-tests: functional-make functional-run
- stress-tests: stress-make stress-run
---- functional/mqueues/run.sh 2004-07-05 23:49:05.000000000 +0200
-+++ functional/mqueues/run.sh 2004-09-01 18:40:17.000000000 +0200
-@@ -12,7 +12,11 @@
- {
- echo "TEST: " $1
- TOTAL=$TOTAL+1
-- ./$1
-+ expect << EOF
-+set timeout 30
-+eval spawn `pwd`/$1
-+expect
-+EOF
- if [ $? == 0 ]; then
- PASS=$PASS+1
- echo -ne "\t\t\t***TEST PASSED***\n\n"
---- functional/semaphores/run.sh 2004-07-05 23:49:05.000000000 +0200
-+++ functional/semaphores/run.sh 2004-09-01 18:40:17.000000000 +0200
-@@ -12,7 +12,11 @@
- {
- echo "TEST: " $1
- TOTAL=$TOTAL+1
-- ./$1
-+ expect << EOF
-+set timeout 30
-+eval spawn `pwd`/$1
-+expect
-+EOF
- if [ $? == 0 ]; then
- PASS=$PASS+1
- echo -ne "\t\t\t***TEST PASSED***\n\n"
---- functional/threads/pi_test/run.sh 2004-07-05 23:49:05.000000000 +0200
-+++ functional/threads/pi_test/run.sh 2004-09-01 18:40:17.000000000 +0200
-@@ -21,7 +21,11 @@
- {
- echo "TEST: " $1
- TOTAL=$TOTAL+1
-- ./$1 > output.$1
-+ expect << EOF > output.$1
-+set timeout 30
-+eval spawn `pwd`/$1
-+expect
-+EOF
- if [ $? == 0 ]; then
- PASS=$PASS+1
- echo -ne "\t\t\t***TEST PASSED***\n\n"
---- functional/threads/robust_test/run.sh 2004-07-05 23:49:05.000000000 +0200
-+++ functional/threads/robust_test/run.sh 2004-09-01 18:40:17.000000000 +0200
-@@ -7,7 +7,11 @@
- {
- echo "TEST: " $1
- TOTAL=$TOTAL+1
-- ./$1
-+ expect << EOF
-+set timeout 30
-+eval spawn `pwd`/$1
-+expect
-+EOF
- if [ $? == 0 ]; then
- PASS=$PASS+1
- echo -ne "\t\t\t***TEST PASSED***\n\n"
---- stress/mqueues/run.sh 2004-07-05 23:49:05.000000000 +0200
-+++ stress/mqueues/run.sh 2004-09-01 18:40:17.000000000 +0200
-@@ -12,7 +12,11 @@
- {
- echo "TEST: " $1 $2
- TOTAL=$TOTAL+1
-- ./$1 $2
-+ expect << EOF
-+set timeout 30
-+eval spawn `pwd`/$1 $2
-+expect
-+EOF
- if [ $? == 0 ]; then
- PASS=$PASS+1
- echo -ne "\t\t\t***TEST PASSED***\n\n"
---- stress/semaphores/run.sh 2004-07-05 23:49:05.000000000 +0200
-+++ stress/semaphores/run.sh 2004-09-01 18:40:17.000000000 +0200
-@@ -12,7 +12,11 @@
- {
- echo "TEST: " $1 $2
- TOTAL=$TOTAL+1
-- ./$1 $2
-+ expect << EOF
-+set timeout 30
-+eval spawn `pwd`/$1 $2
-+expect
-+EOF
- if [ $? == 0 ]; then
- PASS=$PASS+1
- echo -ne "\t\t\t***TEST PASSED***\n\n"
---- make_is_dumb 1970-01-01 01:00:00.000000000 +0100
-+++ make_is_dumb 2004-09-01 19:55:41.000000000 +0200
-@@ -0,0 +1,8 @@
-+#!/bin/sh
-+if test -e $1 ; then
-+ expect << EOF
-+set timeout 30
-+eval spawn `pwd`/$1
-+expect
-+EOF
-+fi
Copied: trunk/posixtestsuite/debian/patches/02_timeout.patch (from rev 1122, trunk/posixtestsuite/debian/patches/02_expect.diff)
===================================================================
--- trunk/posixtestsuite/debian/patches/02_timeout.patch (rev 0)
+++ trunk/posixtestsuite/debian/patches/02_timeout.patch 2007-05-18 04:48:17 UTC (rev 1937)
@@ -0,0 +1,102 @@
+#DPATCHLEVEL=1
+diff -Nur posixtestsuite-1.4.3.old/timeout posixtestsuite-1.4.3/timeout
+--- posixtestsuite-1.4.3.old/timeout 1970-01-01 01:00:00.000000000 +0100
++++ posixtestsuite-1.4.3/timeout 2004-09-01 19:55:41.000000000 +0200
+@@ -0,0 +1,8 @@
++#!/bin/sh
++if test -e $1 ; then
++ expect << EOF
++set timeout 30
++eval spawn `pwd`/$1 $2
++expect
++EOF
++fi
+diff -Nur posixtestsuite-1.4.3.old/Makefile posixtestsuite-1.4.3/Makefile
+--- posixtestsuite-1.4.3.old/Makefile 2004-07-07 16:19:07.000000000 +0200
++++ posixtestsuite-1.4.3/Makefile 2004-09-01 18:41:01.000000000 +0200
+@@ -46,7 +46,11 @@
+ all: build-tests run-tests
+
+ build-tests: $(BUILD_TESTS:.c=.test)
+-run-tests: $(RUN_TESTS:.test=.run-test)
++run-tests:
++ -chmod 755 timeout
++ for i in $(RUN_TESTS); do \
++ ./timeout $$i; \
++ done
+
+ functional-tests: functional-make functional-run
+ stress-tests: stress-make stress-run
+diff -Nur posixtestsuite-1.4.3.old/functional/mqueues/run.sh posixtestsuite-1.4.3/functional/mqueues/run.sh
+--- posixtestsuite-1.4.3.old/functional/mqueues/run.sh 2004-07-05 23:49:05.000000000 +0200
++++ posixtestsuite-1.4.3/functional/mqueues/run.sh 2004-09-01 18:40:17.000000000 +0200
+@@ -12,7 +12,7 @@
+ {
+ echo "TEST: " $1
+ TOTAL=$TOTAL+1
+- ./$1
++ ../../timeout $1
+ if [ $? == 0 ]; then
+ PASS=$PASS+1
+ echo -ne "\t\t\t***TEST PASSED***\n\n"
+diff -Nur posixtestsuite-1.4.3.old/functional/semaphores/run.sh posixtestsuite-1.4.3/functional/semaphores/run.sh
+--- posixtestsuite-1.4.3.old/functional/semaphores/run.sh 2004-07-05 23:49:05.000000000 +0200
++++ posixtestsuite-1.4.3/functional/semaphores/run.sh 2004-09-01 18:40:17.000000000 +0200
+@@ -12,7 +12,7 @@
+ {
+ echo "TEST: " $1
+ TOTAL=$TOTAL+1
+- ./$1
++ ../../timeout $1
+ if [ $? == 0 ]; then
+ PASS=$PASS+1
+ echo -ne "\t\t\t***TEST PASSED***\n\n"
+diff -Nur posixtestsuite-1.4.3.old/functional/threads/pi_test/run.sh posixtestsuite-1.4.3/functional/threads/pi_test/run.sh
+--- posixtestsuite-1.4.3.old/functional/threads/pi_test/run.sh 2004-07-05 23:49:05.000000000 +0200
++++ posixtestsuite-1.4.3/functional/threads/pi_test/run.sh 2004-09-01 18:40:17.000000000 +0200
+@@ -21,7 +21,7 @@
+ {
+ echo "TEST: " $1
+ TOTAL=$TOTAL+1
+- ./$1 > output.$1
++ ../../timeout $1 > output.$1
+ if [ $? == 0 ]; then
+ PASS=$PASS+1
+ echo -ne "\t\t\t***TEST PASSED***\n\n"
+diff -Nur posixtestsuite-1.4.3.old/functional/threads/robust_test/run.sh posixtestsuite-1.4.3/functional/threads/robust_test/run.sh
+--- posixtestsuite-1.4.3.old/functional/threads/robust_test/run.sh 2004-07-05 23:49:05.000000000 +0200
++++ posixtestsuite-1.4.3/functional/threads/robust_test/run.sh 2004-09-01 18:40:17.000000000 +0200
+@@ -7,7 +7,7 @@
+ {
+ echo "TEST: " $1
+ TOTAL=$TOTAL+1
+- ./$1
++ ../../timeout $1
+ if [ $? == 0 ]; then
+ PASS=$PASS+1
+ echo -ne "\t\t\t***TEST PASSED***\n\n"
+diff -Nur posixtestsuite-1.4.3.old/stress/mqueues/run.sh posixtestsuite-1.4.3/stress/mqueues/run.sh
+--- posixtestsuite-1.4.3.old/stress/mqueues/run.sh 2004-07-05 23:49:05.000000000 +0200
++++ posixtestsuite-1.4.3/stress/mqueues/run.sh 2004-09-01 18:40:17.000000000 +0200
+@@ -12,7 +12,7 @@
+ {
+ echo "TEST: " $1 $2
+ TOTAL=$TOTAL+1
+- ./$1 $2
++ ../../timeout $1 $2
+ if [ $? == 0 ]; then
+ PASS=$PASS+1
+ echo -ne "\t\t\t***TEST PASSED***\n\n"
+diff -Nur posixtestsuite-1.4.3.old/stress/semaphores/run.sh posixtestsuite-1.4.3/stress/semaphores/run.sh
+--- posixtestsuite-1.4.3.old/stress/semaphores/run.sh 2004-07-05 23:49:05.000000000 +0200
++++ posixtestsuite-1.4.3/stress/semaphores/run.sh 2004-09-01 18:40:17.000000000 +0200
+@@ -12,7 +12,7 @@
+ {
+ echo "TEST: " $1 $2
+ TOTAL=$TOTAL+1
+- ./$1 $2
++ ../../timeout $1 $2
+ if [ $? == 0 ]; then
+ PASS=$PASS+1
+ echo -ne "\t\t\t***TEST PASSED***\n\n"
+
More information about the Glibc-bsd-commits
mailing list