On 2009-01-12 17:16, Ying Zhang wrote: > Sorry, forgot to mention: please don't propagate these changes to HEAD!
I took care of that. > Thanks. > > Jennie > > > On Mon, Jan 12, 2009 at 04:01:02PM +0000, Ying Zhang wrote: >> Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests >> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10518 >> >> Modified Files: >> Tag: Nov2008 >> add_del_doc.xq.in add_del_doc_noxrpc.xq.in add_trusted.mil >> backup_restore.xq.in backup_restore_noxrpc.xq.in db_env.xq.in >> db_env_noxrpc.xq.in db_stats.xq.in db_stats_noxrpc.xq.in >> Log Message: >> - *.xq.in >> >> the xrpc http server is not available (yet) in RunMtest, hence, use the >> module >> file 'admin.xq'-s local path, instead of using its URL served by the xrpc >> http server. >> >> -add_trusted.mil >> >> allow 'admin.xq' to be executed >> >> >> >> U add_del_doc.xq.in >> Index: add_del_doc.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/add_del_doc.xq.in,v >> retrieving revision 1.1.4.3 >> retrieving revision 1.1.4.4 >> diff -u -d -r1.1.4.3 -r1.1.4.4 >> --- add_del_doc.xq.in 9 Jan 2009 10:36:24 -0000 1.1.4.3 >> +++ add_del_doc.xq.in 12 Jan 2009 16:01:00 -0000 1.1.4.4 >> @@ -11,17 +11,17 @@ >> - adm:del-doc() >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> (execute at {"$HOST:$XRPCPORT"} >> - {adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark1.xml";, >> + {adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark1.xml", >> "xmark1.xml", "xmark", 10)}, >> execute at {"$HOST:$XRPCPORT"} >> - {adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark2.xml";, >> + {adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark2.xml", >> "xmark2.xml", "xmark", 10)} >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text { " "}, >> <collections-after-add>{ >> @@ -61,11 +61,11 @@ >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> execute at {"$HOST:$XRPCPORT"} {adm:del-col("xmark")} >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text { " "}, >> <collections-after-del>{ >> >> U backup_restore_noxrpc.xq.in >> Index: backup_restore_noxrpc.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/backup_restore_noxrpc.xq.in,v >> retrieving revision 1.1.2.2 >> retrieving revision 1.1.2.3 >> diff -u -d -r1.1.2.2 -r1.1.2.3 >> --- backup_restore_noxrpc.xq.in 9 Jan 2009 14:40:24 -0000 1.1.2.2 >> +++ backup_restore_noxrpc.xq.in 12 Jan 2009 16:01:00 -0000 1.1.2.3 >> @@ -15,13 +15,13 @@ >> - adm:restore-col() >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> -(adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark1.xml";, "xmark1.xml", >> "xmark", 10), >> - adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark2.xml";, "xmark2.xml", >> "xmark", 10) >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> +(adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark1.xml", "xmark1.xml", >> "xmark", 10), >> + adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark2.xml", "xmark2.xml", >> "xmark", 10) >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text {" "}, >> <db-before-backup>{ >> @@ -38,23 +38,23 @@ >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> adm:backup("test") >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> adm:del-col("xmark") >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> <db-after-del>{ adm:collections() }</db-after-del> >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> adm:restore("test", 10) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text {" "}, >> <db-after-restore>{ >> @@ -73,11 +73,11 @@ >> <> >> (: clean DB at the end of the test :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> adm:del-col("xmark") >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> <db-after-cleanup> >> { adm:documents() } >> </db-after-cleanup> >> >> U db_env_noxrpc.xq.in >> Index: db_env_noxrpc.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/db_env_noxrpc.xq.in,v >> retrieving revision 1.1.2.1 >> retrieving revision 1.1.2.2 >> diff -u -d -r1.1.2.1 -r1.1.2.2 >> --- db_env_noxrpc.xq.in 9 Jan 2009 10:36:24 -0000 1.1.2.1 >> +++ db_env_noxrpc.xq.in 12 Jan 2009 16:01:00 -0000 1.1.2.2 >> @@ -4,7 +4,7 @@ >> Filter out uninteresting differences in the results >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> for $env in adm:db-env() >> return >> (text { " " }, >> >> U db_stats.xq.in >> Index: db_stats.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/db_stats.xq.in,v >> retrieving revision 1.1.4.2 >> retrieving revision 1.1.4.3 >> diff -u -d -r1.1.4.2 -r1.1.4.3 >> --- db_stats.xq.in 18 Nov 2008 10:43:35 -0000 1.1.4.2 >> +++ db_stats.xq.in 12 Jan 2009 16:01:00 -0000 1.1.4.3 >> @@ -4,7 +4,7 @@ >> Filter out uninteresting differences in the results >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> for $stat in execute at {"$HOST:$XRPCPORT"} {adm:db-stats()} >> return >> (text { " " }, >> >> U add_del_doc_noxrpc.xq.in >> Index: add_del_doc_noxrpc.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/add_del_doc_noxrpc.xq.in,v >> retrieving revision 1.1.2.1 >> retrieving revision 1.1.2.2 >> diff -u -d -r1.1.2.1 -r1.1.2.2 >> --- add_del_doc_noxrpc.xq.in 9 Jan 2009 10:36:24 -0000 1.1.2.1 >> +++ add_del_doc_noxrpc.xq.in 12 Jan 2009 16:01:00 -0000 1.1.2.2 >> @@ -11,13 +11,13 @@ >> - adm:del-doc() >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> -(adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark1.xml";, "xmark1.xml", >> "xmark", 10), >> - adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark2.xml";, "xmark2.xml", >> "xmark", 10) >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> +(adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark1.xml", "xmark1.xml", >> "xmark", 10), >> + adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark2.xml", "xmark2.xml", >> "xmark", 10) >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text { " "}, >> <collections-after-add>{ >> @@ -57,11 +57,11 @@ >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> adm:del-col("xmark") >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text { " "}, >> <collections-after-del>{ >> >> U db_stats_noxrpc.xq.in >> Index: db_stats_noxrpc.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/db_stats_noxrpc.xq.in,v >> retrieving revision 1.1.2.1 >> retrieving revision 1.1.2.2 >> diff -u -d -r1.1.2.1 -r1.1.2.2 >> --- db_stats_noxrpc.xq.in 9 Jan 2009 10:36:24 -0000 1.1.2.1 >> +++ db_stats_noxrpc.xq.in 12 Jan 2009 16:01:00 -0000 1.1.2.2 >> @@ -4,7 +4,7 @@ >> Filter out uninteresting differences in the results >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> for $stat in adm:db-stats() >> return >> (text { " " }, >> >> U db_env.xq.in >> Index: db_env.xq.in >> =================================================================== >> RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/db_env.xq.in,v >> retrieving revision 1.1.4.2 >> retrieving revision 1.1.4.3 >> diff -u -d -r1.1.4.2 -r1.1.4.3 >> --- db_env.xq.in 18 Nov 2008 10:43:35 -0000 1.1.4.2 >> +++ db_env.xq.in 12 Jan 2009 16:01:00 -0000 1.1.4.3 >> @@ -4,7 +4,7 @@ >> Filter out uninteresting differences in the results >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> for $env in execute at {"$HOST:$XRPCPORT"} {adm:db-env()} >> return >> (text { " " }, >> >> U add_trusted.mil >> Index: add_trusted.mil >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/add_trusted.mil,v >> retrieving revision 1.1.4.2 >> retrieving revision 1.1.4.3 >> diff -u -d -r1.1.4.2 -r1.1.4.3 >> --- add_trusted.mil 18 Nov 2008 10:43:35 -0000 1.1.4.2 >> +++ add_trusted.mil 12 Jan 2009 16:01:00 -0000 1.1.4.3 >> @@ -2,12 +2,17 @@ >> module("unix"); >> >> var TSTSRCDIR := getenv("TSTSRCDIR"); >> +var TSTSRCBASE := getenv("TSTSRCBASE"); >> var TSTTRGDIR := getenv("TSTTRGDIR"); >> +var TSTTRGBASE := getenv("TSTTRGBASE"); >> var HOST := getenv("HOST"); >> var XRPCPORT := getenv("XRPCPORT"); >> >> add_xrpc_trusted(TSTSRCDIR); >> +add_xrpc_trusted(TSTSRCBASE); >> + >> add_xrpc_trusted(TSTTRGDIR); >> +add_xrpc_trusted(TSTTRGBASE); >> add_xrpc_trusted("http://"+HOST+":"+XRPCPORT); >> >> commit(); >> >> U backup_restore.xq.in >> Index: backup_restore.xq.in >> =================================================================== >> RCS file: >> /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/Tests/backup_restore.xq.in,v >> retrieving revision 1.1.4.5 >> retrieving revision 1.1.4.6 >> diff -u -d -r1.1.4.5 -r1.1.4.6 >> --- backup_restore.xq.in 9 Jan 2009 14:40:24 -0000 1.1.4.5 >> +++ backup_restore.xq.in 12 Jan 2009 16:01:00 -0000 1.1.4.6 >> @@ -15,17 +15,17 @@ >> - adm:restore-col() >> :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> (execute at {"$HOST:$XRPCPORT"} >> - {adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark1.xml";, >> + {adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark1.xml", >> "xmark1.xml", "xmark", 10)}, >> execute at {"$HOST:$XRPCPORT"} >> - {adm:add-doc("http://$HOST:$XRPCPORT/admin/xmark2.xml";, >> + {adm:add-doc("$TSTSRCBASE/runtime/xrpc/admin/xmark2.xml", >> "xmark2.xml", "xmark", 10)} >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text {" "}, >> <db-before-backup>{ >> @@ -42,25 +42,25 @@ >> ) >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> execute at {"$HOST:$XRPCPORT"} {adm:backup("test")} >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> execute at {"$HOST:$XRPCPORT"} {adm:del-col("xmark")} >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> <db-after-del>{ >> execute at {"$HOST:$XRPCPORT"} {adm:collections()} >> }</db-after-del> >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> execute at {"$HOST:$XRPCPORT"} {adm:restore("test", 10)} >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> ( >> text {" "}, >> <db-after-restore>{ >> @@ -79,11 +79,11 @@ >> <> >> (: clean DB at the end of the test :) >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> execute at {"$HOST:$XRPCPORT"} {adm:del-col("xmark")} >> <> >> import module namespace adm = "http://monetdb.cwi.nl/XQuery/admin/"; >> - at "http://$HOST:$XRPCPORT/admin/admin.xq";; >> + at "$TSTSRCBASE/runtime/xrpc/admin/admin.xq"; >> <db-after-cleanup> >> { execute at {"$HOST:$XRPCPORT"} {adm:documents()} } >> </db-after-cleanup> >> >> >> ------------------------------------------------------------------------------ >> Check out the new SourceForge.net Marketplace. >> It is the best place to buy or sell services for >> just about anything Open Source. >> http://p.sf.net/sfu/Xq1LFB >> _______________________________________________ >> Monetdb-pf-checkins mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by: > SourcForge Community > SourceForge wants to tell your story. > http://p.sf.net/sfu/sf-spreadtheword > _______________________________________________ > Monetdb-pf-checkins mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins -- Sjoerd Mullender ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ Monetdb-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/monetdb-developers
