Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2304/src/testing
Modified Files:
MkillUsers.in Mtest.py.in
Log Message:
propagated changes of Saturday Nov 10 2007 - Thursday Nov 15 2007
from the MonetDB_1-20 branch to the development trunk
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- Mtest.py.in 7 Nov 2007 15:44:24 -0000 1.321
+++ Mtest.py.in 15 Nov 2007 18:37:08 -0000 1.322
@@ -3092,8 +3092,9 @@
if os.path.isdir(env[p]):
os.chdir(env[p])
if os.getcwd() != env[p]:
- Warn(p+": Replacing logical path "+env[p]+
- " by absolute physical path "+os.getcwd())
+ if not quiet:
+ Warn(p+": Replacing logical path "+env[p]+
+ " by absolute physical path "+os.getcwd())
env[p] = os.getcwd()
else:
ErrXit("Illegal "+p+": directory '"+env[p]+"' does not exist!")
Index: MkillUsers.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/MkillUsers.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- MkillUsers.in 8 Nov 2007 19:14:55 -0000 1.31
+++ MkillUsers.in 15 Nov 2007 18:37:08 -0000 1.32
@@ -50,7 +50,7 @@
cpids=""
if [ "$PARENT" ] ; then
- cpids="`ps -ef | egrep '^ *[a-zA-Z0-9_]+ +[0-9]+ +'"$PARENT"' ' | egrep -v
'^ *[a-zA-Z0-9_]+ +'"$CHILD"' +[0-9]+ | '"$0"' ' | sort -k 4.1 | awk '{printf
"%s " , $2}' | perl -pe 's| *$||'`"
+ cpids="`ps -ef | egrep '^ *[a-zA-Z0-9_]+ +[0-9]+ +'"$PARENT"' ' | egrep -v
'^ *[a-zA-Z0-9_]+ +'"$CHILD"' +[0-9]+ | '"$0"' | '"$THISPATH/Mtest.py"' ' |
sort -k 4.1 | awk '{printf "%s " , $2}' | perl -pe 's| *$||'`"
if [ "$cpids" ] ; then
# KIDS="`echo "($cpids)" | perl -pe 's/ /|/g'`"
# gpids="`ps -ef | egrep '^ *[a-zA-Z0-9_]+ +[0-9]+ +'"$KIDS"' ' | egrep
-v '^ *[a-zA-Z0-9_]+ +'"$CHILD"' +[0-9]+ | '"$0"' ' | sort -k 4.1 | awk
'{printf "%s " , $2}' | perl -pe 's| *$||'`"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
