Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2142/src/testing
Modified Files:
Tag: GDK-2
MkillUsers.in difflib.c helpers.c helpers.h
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: difflib.c
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/difflib.c,v
retrieving revision 1.45.4.1
retrieving revision 1.45.4.2
diff -u -d -r1.45.4.1 -r1.45.4.2
--- difflib.c 6 Sep 2007 13:50:58 -0000 1.45.4.1
+++ difflib.c 10 Sep 2007 14:21:58 -0000 1.45.4.2
@@ -922,7 +922,7 @@
if (!u_diff2lwc_diff(mindiff, LWC, u_diff_fn, lwc_diff_fn))
/* { UNLINK(lwc_diff_fn); ERRHNDL(0,"u_diff2lwc_diff returns 0
in u_diff2html","",1); } */
- SYSTEM(strconcat("touch ", lwc_diff_fn));
+ fclose(Wfopen(lwc_diff_fn));
rtrn = lwc_diff2html(u_diff_fn, (char *) 0, lwc_diff_fn, html_fn,
caption, revision);
@@ -945,7 +945,7 @@
if (!oldnew2lwc_diff(mindiff, LWC, context, ignore, old_fn, new_fn,
lwc_diff_fn))
/* { UNLINK(lwc_diff_fn); ERRHNDL(0,"oldnew2lwc_diff returns 0
in oldnew2html","",1); } */
- SYSTEM(strconcat("touch ", lwc_diff_fn));
+ fclose(Wfopen(lwc_diff_fn));
rtrn = lwc_diff2html(old_fn, new_fn, lwc_diff_fn, html_fn, caption,
revision);
Index: MkillUsers.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/MkillUsers.in,v
retrieving revision 1.25.6.3
retrieving revision 1.25.6.4
diff -u -d -r1.25.6.3 -r1.25.6.4
--- MkillUsers.in 3 Sep 2007 12:53:44 -0000 1.25.6.3
+++ MkillUsers.in 10 Sep 2007 14:21:58 -0000 1.25.6.4
@@ -77,7 +77,8 @@
if [ "$PLAYPEN_PREFIX" ] ; then BINPATH="$BINPATH $PLAYPEN_PREFIX/bin" ;
fi
if [ "$TEMPLATE_PREFIX" ] ; then BINPATH="$BINPATH $TEMPLATE_PREFIX/bin" ;
fi
if [ "$PATHFINDER_PREFIX" ] ; then BINPATH="$BINPATH $PATHFINDER_PREFIX/bin" ;
fi
-if [ "$CLIENTS_BUILD" ] ; then BINPATH="$BINPATH
$CLIENTS_BUILD/src/tools $CLIENTS_BUILD/src/tools/.libs" ; fi
+if [ "$DATACELL_PREFIX" ] ; then BINPATH="$BINPATH $DATACELL_PREFIX/bin" ;
fi
+if [ "$CLIENTS_BUILD" ] ; then BINPATH="$BINPATH
$CLIENTS_BUILD/src/mapiclient $CLIENTS_BUILD/src/mapiclient/.libs
$CLIENTS_BUILD/src/python $CLIENTS_BUILD/src/java/scripts" ; fi
if [ "$MONETDB_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB_BUILD/src/tools $MONETDB_BUILD/src/tools/.libs" ; fi
if [ "$MONETDB4_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB4_BUILD/src/tools $MONETDB4_BUILD/src/tools/.libs" ; fi
if [ "$MONETDB5_BUILD" ] ; then BINPATH="$BINPATH
$MONETDB5_BUILD/src/tools $MONETDB5_BUILD/src/tools/.libs" ; fi
@@ -91,9 +92,10 @@
if [ "$TIMES100_BUILD" ] ; then BINPATH="$BINPATH
$TIMES100_BUILD/src/tools $TIMES100_BUILD/src/tools/.libs" ; fi
if [ "$PLAYPEN_BUILD" ] ; then BINPATH="$BINPATH
$PLAYPEN_BUILD/src/tools $PLAYPEN_BUILD/src/tools/.libs" ; fi
if [ "$TEMPLATE_BUILD" ] ; then BINPATH="$BINPATH
$TEMPLATE_BUILD/src/tools $TEMPLATE_BUILD/src/tools/.libs" ; fi
-if [ "$PATHFINDER_BUILD" ] ; then BINPATH="$BINPATH
$PATHFINDER_BUILD/src/tools $PATHFINDER_BUILD/src/tools/.libs" ; fi
+if [ "$PATHFINDER_BUILD" ] ; then BINPATH="$BINPATH
$PATHFINDER_BUILD/src/tools $PATHFINDER_BUILD/src/tools/.libs
$PATHFINDER_BUILD/compiler $PATHFINDER_BUILD/compiler/.libs" ; fi
+if [ "$DATACELL_BUILD" ] ; then BINPATH="$BINPATH
$DATACELL_BUILD/src/tools $DATACELL_BUILD/src/tools/.libs" ; fi
for b in $BINPATH ; do
- files="$files `ls $b/* 2>/dev/null | egrep
'/(mserver5|Mserver|mclient|mclient\.py|Mdiff|Mlog|Mtimeout|pf)$'`"
+ files="$files `ls $b/* 2>/dev/null | egrep
'/(lt-)?(mserver5|Mserver|mclient|mclient\.py|mjclient|Mdiff|Mlog|Mtimeout|pf|actuator|sensor)$'`"
done
case `uname` in
Index: helpers.h
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/helpers.h,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -u -d -r1.12 -r1.12.6.1
--- helpers.h 3 Jan 2007 12:21:13 -0000 1.12
+++ helpers.h 10 Sep 2007 14:22:00 -0000 1.12.6.1
@@ -28,7 +28,6 @@
FILE *Rfopen(char *name);
FILE *Wfopen(char *name);
FILE *Afopen(char *name);
-char *strconcat(char *a, char *b);
int isalpha_(int c);
char *filename(char *path);
char *tmpdir(void);
Index: helpers.c
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/helpers.c,v
retrieving revision 1.16
retrieving revision 1.16.6.1
diff -u -d -r1.16 -r1.16.6.1
--- helpers.c 3 Jan 2007 12:21:12 -0000 1.16
+++ helpers.c 10 Sep 2007 14:22:00 -0000 1.16.6.1
@@ -81,18 +81,6 @@
/* Afopen */
-char *
-strconcat(char *a, char *b)
-{
- char *s = (char *) malloc(strlen(a) + strlen(b) + 1);
-
- sprintf(s, "%s%s", a, b);
- return s;
-}
-
-/* strconcat */
-
-
int
isalpha_(int c)
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
